t / t4101 / diff.3-2on commit am -3: do not let failed merge from completing the error codepath (c63d4b2)
   1--- a/frotz
   2+++ b/frotz
   3@@ -1,3 +1,2 @@
   4 a
   5-c
   6 b
   7\ No newline at end of file