Merge branch 'hv/submodule-not-yet-pushed-fix' into maint
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"