Merge branch 'dt/clean-pathspec-filter-then-lstat' into maint
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"