t / t4101 / diff.1-0on commit rebase --merge: return control to caller, for housekeeping (01a1e64)
   1--- a/frotz
   2+++ b/frotz
   3@@ -1,3 +1,2 @@
   4 a
   5 b
   6-c