mergetools / vimdiff2on commit Merge branch 'mt/send-email-cc-match-fix' into maint (8ca36db)
   1. "$MERGE_TOOLS_DIR/vimdiff"