mergetools / gvimdiff2on commit Merge branch 'mm/send-email-cc-cruft-after-address' into maint (a3f2781)
   1. "$MERGE_TOOLS_DIR/vimdiff"