Merge branch 'br/svn-doc-include-paths-config'
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"