From owner-freebsd-questions  Wed Dec 22  9:20:32 1999
Delivered-To: freebsd-questions@freebsd.org
Received: from axl.noc.iafrica.com (axl.noc.iafrica.com [196.31.1.175])
	by hub.freebsd.org (Postfix) with ESMTP id BB634154F9
	for <freebsd-questions@freebsd.org>; Wed, 22 Dec 1999 09:20:24 -0800 (PST)
	(envelope-from sheldonh@axl.noc.iafrica.com)
Received: from sheldonh (helo=axl.noc.iafrica.com)
	by axl.noc.iafrica.com with local-esmtp (Exim 3.11 #1)
	id 120pRc-0009Cp-00; Wed, 22 Dec 1999 19:21:00 +0200
From: Sheldon Hearn <sheldonh@uunet.co.za>
To: Jonathon McKitrick <jcm@dogma.freebsd-uk.eu.org>
Cc: freebsd-questions@FreeBSD.ORG
Subject: Re: mergemaster after upgrade 
In-reply-to: Your message of "Wed, 22 Dec 1999 17:17:57 GMT."
             <Pine.BSF.4.21.9912221716560.16947-100000@dogma.freebsd-uk.eu.org> 
Date: Wed, 22 Dec 1999 19:21:00 +0200
Message-ID: <35390.945883260@axl.noc.iafrica.com>
Sender: owner-freebsd-questions@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG



On Wed, 22 Dec 1999 17:17:57 GMT, Jonathon McKitrick wrote:

> So the best bet is to just carefully go through mergemaster, and figure
> out what everything means?  Then decide whether it needs merging or not?

Yes.

Ciao,
Sheldon.


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-questions" in the body of the message