t / t4018 / cpp-struct-single-lineon commit sequencer: do not squash 'reword' commits when we hit conflicts (a9279c6)
   1void wrong()
   2{
   3}
   4
   5struct RIGHT_iterator_tag {};
   6
   7int ChangeMe;