Merge branch 'ms/submodule-update-config-doc'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"