Merge branch 'wt/doc-submodule-name-path-confusion-1'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"