t / t4101 / diff.3-2on commit Add builtin merge-file, a minimal replacement for RCS merge (ba1f5f3)
   1--- a/frotz
   2+++ b/frotz
   3@@ -1,3 +1,2 @@
   4 a
   5-c
   6 b
   7\ No newline at end of file