mergetools / gvimdiffon commit transport-helper: mismerge fix (a21455a)
   1. "$MERGE_TOOLS_DIR/vimdiff"