Merge branch 'jk/reject-newer-extensions-in-v0' into master
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"