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