Merge branch 'bc/vcs-svn-cleanup' into maint
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"