Merge branch 'tr/do-not-call-submodules-subprojects'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"