Date: Mon, 28 Jan 2002 10:48:07 +1030 From: Greg Lehey <grog@FreeBSD.org> To: Kris Kennaway <kris@FreeBSD.org> Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/crypto/openssl/crypto/evp evp.h src/crypto/openssl/crypto/rsa rsa.h rsa_eay.c src/crypto/openssl/ssl s23_clnt.c s23_srvr.c s2_clnt.c s2_enc.c s2_pkt.c s2_srvr.c Message-ID: <20020128104807.O72512@wantadilla.lemis.com> In-Reply-To: <200201270317.g0R3HDh14980@freefall.freebsd.org> References: <200201270317.g0R3HDh14980@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Saturday, 26 January 2002 at 19:17:13 -0800, Kris Kennaway wrote: > kris 2002/01/26 19:17:13 PST > > Modified files: > crypto/openssl/crypto/evp evp.h > crypto/openssl/crypto/rsa rsa.h rsa_eay.c > crypto/openssl/ssl s23_clnt.c s23_srvr.c s2_clnt.c s2_enc.c > s2_pkt.c s2_srvr.c > Log: > Resolve conflicts. > > Revision Changes Path > 1.9 +2 -4 src/crypto/openssl/crypto/evp/evp.h > 1.7 +3 -4 src/crypto/openssl/crypto/rsa/rsa.h > 1.7 +32 -3 src/crypto/openssl/crypto/rsa/rsa_eay.c > 1.6 +2 -2 src/crypto/openssl/ssl/s23_clnt.c > 1.6 +81 -12 src/crypto/openssl/ssl/s23_srvr.c > 1.7 +89 -22 src/crypto/openssl/ssl/s2_clnt.c > 1.6 +3 -3 src/crypto/openssl/ssl/s2_enc.c > 1.7 +38 -21 src/crypto/openssl/ssl/s2_pkt.c > 1.7 +120 -22 src/crypto/openssl/ssl/s2_srvr.c That's a lot of conflicts. Some of them appear to be added copyright notices and some code changes which aren't immediately apparent, but don't look much like conflicts to me. Can't we have a more descriptive log message? Greg -- See complete headers for address and phone numbers To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020128104807.O72512>