mergetools / vimdiff2on commit Sync with maint (83f18cd)
   1. "$MERGE_TOOLS_DIR/vimdiff"