Merge branch 'ps/submodule-sanitize-path-upon-add'
[git/git-svn.git] / mergetools / vimdiff3
blob04a5bb0ea8484244e420ef13072773623c5b0366
1 . "$MERGE_TOOLS_DIR/vimdiff"