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