t / t4101 / diff.3-2on commit Use merge-recursive in git-checkout -m (branch switching) (c1a4278)
   1--- a/frotz
   2+++ b/frotz
   3@@ -1,3 +1,2 @@
   4 a
   5-c
   6 b
   7\ No newline at end of file