t / t4101 / diff.1-0on commit Fix read-tree merging more than 3 trees using 3-way merge (f34f2b0)
   1--- a/frotz
   2+++ b/frotz
   3@@ -1,3 +1,2 @@
   4 a
   5 b
   6-c