t / t4101 / diff.0-1on commit sequencer: do not squash 'reword' commits when we hit conflicts (a9279c6)
   1--- a/frotz
   2+++ b/frotz
   3@@ -1,2 +1,3 @@
   4 a
   5 b
   6+c