t / t4101 / diff.0-1on commit Merge branch 'jc/maint-combine-diff-pre-context' into maint (4ace4fc)
   1--- a/frotz
   2+++ b/frotz
   3@@ -1,2 +1,3 @@
   4 a
   5 b
   6+c