From owner-freebsd-current  Tue Nov 12 19:54: 0 2002
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id B837537B401
	for <current@freebsd.org>; Tue, 12 Nov 2002 19:53:59 -0800 (PST)
Received: from obsecurity.dyndns.org (adsl-63-207-60-146.dsl.lsan03.pacbell.net [63.207.60.146])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0FA0843E42
	for <current@freebsd.org>; Tue, 12 Nov 2002 19:53:54 -0800 (PST)
	(envelope-from kris@obsecurity.org)
Received: from rot13.obsecurity.org (rot13.obsecurity.org [10.0.0.5])
	by obsecurity.dyndns.org (Postfix) with ESMTP
	id A00D066B33; Tue, 12 Nov 2002 19:53:53 -0800 (PST)
Received: by rot13.obsecurity.org (Postfix, from userid 1000)
	id CAEAF1215; Tue, 12 Nov 2002 19:56:12 -0800 (PST)
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>
References: <20021113015303.78222.qmail@web14104.mail.yahoo.com>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="T4sUOijqQbZv57TR"
Content-Disposition: inline
In-Reply-To: <20021113015303.78222.qmail@web14104.mail.yahoo.com>
User-Agent: Mutt/1.4i
Sender: owner-freebsd-current@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-current.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-current>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-current>
X-Loop: FreeBSD.ORG


--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