Merge branch 'ah/submodule-typofix-in-error' into maint
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"