Merge branch 'mb/build-contrib-svn-fe'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"