Merge branch 'mt/send-email-cc-match-fix'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"