Date: Tue, 12 Nov 2002 19:56:12 -0800 From: Kris Kennaway <kris@obsecurity.org> To: Galen Sampson <galen_sampson@yahoo.com> Cc: current@freebsd.org Subject: Re: Mergemaster Bug (Though not a serious one) Message-ID: <20021113035612.GA80525@rot13.obsecurity.org> In-Reply-To: <20021113015303.78222.qmail@web14104.mail.yahoo.com> References: <20021113015303.78222.qmail@web14104.mail.yahoo.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--T4sUOijqQbZv57TR Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Tue, Nov 12, 2002 at 05:53:03PM -0800, Galen Sampson wrote: > IIRC the old mergemaster merged changes like this one line at a time. I don't recall it ever behaving this way, but I could be wrong. Kris --T4sUOijqQbZv57TR Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (FreeBSD) iD8DBQE90c1cWry0BWjoQKURAjUjAKC2xdrPhPl/Qea+k2ne4OQ9IpjT6ACfS1X7 uCi0GNIxe1cohcl9fCVNu0k= =SPFN -----END PGP SIGNATURE----- --T4sUOijqQbZv57TR-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20021113035612.GA80525>