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