t / t4101 / diff.1-0on commit completion: add a note that merge options are shared (6d2b06f)
   1--- a/frotz
   2+++ b/frotz
   3@@ -1,3 +1,2 @@
   4 a
   5 b
   6-c