t / t4101 / diff.1-0on commit Merge branch 'mergetool' of git://repo.or.cz/git/mergetool into maint (d3759c0)
   1--- a/frotz
   2+++ b/frotz
   3@@ -1,3 +1,2 @@
   4 a
   5 b
   6-c