mergetools / vimdiff3on commit Merge branch 'mc/commit-doc-grammofix' into maint (afd647c)
   1. "$MERGE_TOOLS_DIR/vimdiff"