Date: Mon, 11 Dec 2000 09:46:25 -0600 From: Christopher Farley <chris@northernbrewer.com> To: freebsd-questions@FreeBSD.ORG Subject: Re: mergemaster Message-ID: <20001211094625.A61816@northernbrewer.com> In-Reply-To: <C12569B2.0054F8EE.00@frmail19.netfr.alcatel.fr>; from Gilles.Guerrini@alcatel.fr on Mon, Dec 11, 2000 at 04:28:06PM %2B0100 References: <C12569B2.0054F8EE.00@frmail19.netfr.alcatel.fr>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20001211094625.A61816>