t / t4013 / diff.diff-tree_-p_masteron commit sequencer: do not squash 'reword' commits when we hit conflicts (a9279c6)
   1$ git diff-tree -p master
   2$