t / t4101 / diff.1-0on commit merge-recursive: make sure when we say we abort that we actually abort (9270239)
   1--- a/frotz
   2+++ b/frotz
   3@@ -1,3 +1,2 @@
   4 a
   5 b
   6-c