t / t4101 / diff.0-2on commit t3407-rebase-abort.sh: Enhance existing tests, and add test for rebase --merge (4947cf9)
   1--- a/frotz
   2+++ b/frotz
   3@@ -1,2 +1,2 @@
   4 a
   5-b
   6+b
   7\ No newline at end of file