mergetools / gvimdiffon commit Sync with maint (ff86faf)
   1. "$MERGE_TOOLS_DIR/vimdiff"