From owner-freebsd-questions Mon Dec 11 7:46:28 2000 From owner-freebsd-questions@FreeBSD.ORG Mon Dec 11 07:46:27 2000 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from kraeusen.nbrewer.com (unknown [208.42.68.65]) by hub.freebsd.org (Postfix) with ESMTP id C8ACA37B402 for ; Mon, 11 Dec 2000 07:46:26 -0800 (PST) Received: by kraeusen.nbrewer.com (Postfix, from userid 1001) id 9C27217430; Mon, 11 Dec 2000 09:46:25 -0600 (CST) Date: Mon, 11 Dec 2000 09:46:25 -0600 From: Christopher Farley To: freebsd-questions@FreeBSD.ORG Subject: Re: mergemaster Message-ID: <20001211094625.A61816@northernbrewer.com> Mail-Followup-To: Christopher Farley , freebsd-questions@FreeBSD.ORG References: Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: ; from Gilles.Guerrini@alcatel.fr on Mon, Dec 11, 2000 at 04:28:06PM +0100 Sender: chris@nbrewer.com Sender: owner-freebsd-questions@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG Gilles.Guerrini@alcatel.fr (Gilles.Guerrini@alcatel.fr) wrote: > Hello, > i want to update my FreeBSD from 4.1 release to 4.2 RELEASE. What a good idea !! > When I do a 'mergemaster', by default, if there is no personnal change, must I 'delete' the new file > or must I 'install' it ?? > Thanks for your help > Gilles G. If the files aren't different, it shouldn't matter which you do. -- Christopher Farley Northern Brewer / 1150 Grand Avenue / St. Paul, MN 55105 www.northernbrewer.com To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message