builtin/merge.c: drop a parameter that is never used

diff --git a/git-send-email.perl b/git-send-email.perl
index 2016d9c6198957943a8bd2510e217fe72412062a..fdb0029b597898559376b1b28d692450794251f3 100755 (executable)
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -1095,7 +1095,8 @@ sub ssl_verify_params {
        }
 
        if (!defined $smtp_ssl_cert_path) {
-               $smtp_ssl_cert_path = "/etc/ssl/certs";
+               # use the OpenSSL defaults
+               return (SSL_verify_mode => SSL_VERIFY_PEER());
        }
 
        if ($smtp_ssl_cert_path eq "") {