Merge branch 'sb/submodule-config-doc-drop-path'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"