Merge branch 'bw/grep-recurse-submodules' into maint
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"