mergetools / gvimdiffon commit merge & sequencer: turn "Conflicts:" hint into a comment (261f315)
   1. "$MERGE_TOOLS_DIR/vimdiff"