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