t / t4101 / diff.1-0on commit Teach git-pull about --[no-]ff, --no-squash and --commit (5072a32)
   1--- a/frotz
   2+++ b/frotz
   3@@ -1,3 +1,2 @@
   4 a
   5 b
   6-c