t / t5100 / msg0016on commit sequencer: do not squash 'reword' commits when we hit conflicts (a9279c6)
   1and some content
   2