Merge branch 'rd/send-email-2047-fix'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"