Merge branch 'mc/doc-submodule-sync-recurse'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"