Merge branch 'jk/grep-e-could-be-extended-beyond-posix' into maint
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"