Merge branch 'mm/send-email-cc-cruft' into maint
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"