Merge branch 'ew/svn-1.9.0-auth' into maint
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"