mergetools / gvimdiffon commit sequencer: do not squash 'reword' commits when we hit conflicts (a9279c6)
   1. "$MERGE_TOOLS_DIR/vimdiff"