mergetools / vimdiff3on commit Sync with maint (75cc6c6)
   1. "$MERGE_TOOLS_DIR/vimdiff"