Merge branch 'jk/send-email-ssl-errors' into maint
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"