t / t4101 / diff.0-3on commit Enable output buffering in merge-recursive. (66a155b)
   1--- a/frotz
   2+++ b/frotz
   3@@ -1,2 +1,3 @@
   4 a
   5-b
   6+c
   7+b
   8\ No newline at end of file