Merge branch 'mc/commit-doc-grammofix' into maint
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"