mergetools / vimdiff2on commit Merge branch 'es/worktree-add' into maint (d091031)
   1. "$MERGE_TOOLS_DIR/vimdiff"