Merge branch 'km/submodule-doc-use-sm-path' into maint
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"