t / t4101 / diff.0-2on commit Merge branch 'jc/maint-1.6.1-add-u-remove-conflicted' into maint-1.6.1 (d9b0443)
   1--- a/frotz
   2+++ b/frotz
   3@@ -1,2 +1,2 @@
   4 a
   5-b
   6+b
   7\ No newline at end of file