Merge branch 'rr/send-email-ssl-verify'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"