Merge branch 'ew/git-svn-http-tests'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"