mergetools / vimdiff3on commit Merge branch 'mg/commit-author-no-match-malformed-message' into maint (7070c03)
   1. "$MERGE_TOOLS_DIR/vimdiff"