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