t / t4101 / diff.1-0on commit git-merge: finish when git-read-tree fails (2be08a8)
   1--- a/frotz
   2+++ b/frotz
   3@@ -1,3 +1,2 @@
   4 a
   5 b
   6-c