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