t / t4101 / diff.0-2on commit t6044: add more testcases with staged changes before a merge is invoked (7f5271f)
   1--- a/frotz
   2+++ b/frotz
   3@@ -1,2 +1,2 @@
   4 a
   5-b
   6+b
   7\ No newline at end of file