t / t4101 / diff.2-0on commit .gitignore: git-merge-recur is a built file. (c8b87ef)
   1--- a/frotz
   2+++ b/frotz
   3@@ -1,2 +1,2 @@
   4 a
   5-b
   6\ No newline at end of file
   7+b