t / t4101 / diff.0-2on commit Merge branch 'jk/maint-ls-files-other' into maint (86e67a0)
   1--- a/frotz
   2+++ b/frotz
   3@@ -1,2 +1,2 @@
   4 a
   5-b
   6+b
   7\ No newline at end of file