mergetools / gvimdiffon commit Merge branch 'br/mergetools-guiffy' (da36be5)
   1. "$MERGE_TOOLS_DIR/vimdiff"