Merge branch 'pb/recurse-submodule-in-worktree-fix' into maint
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"