t / t4101 / diff.1-0on commit Merge branch 'jk/cherry-pick-reword' into maint (c69f921)
   1--- a/frotz
   2+++ b/frotz
   3@@ -1,3 +1,2 @@
   4 a
   5 b
   6-c