From owner-freebsd-questions Mon Dec 11 10:52:31 2000 From owner-freebsd-questions@FreeBSD.ORG Mon Dec 11 10:52:29 2000 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from fw.wintelcom.net (ns1.wintelcom.net [209.1.153.20]) by hub.freebsd.org (Postfix) with ESMTP id 4018A37B402 for ; Mon, 11 Dec 2000 10:52:28 -0800 (PST) Received: (from bright@localhost) by fw.wintelcom.net (8.10.0/8.10.0) id eBBIqKr08149; Mon, 11 Dec 2000 10:52:20 -0800 (PST) Date: Mon, 11 Dec 2000 10:52:19 -0800 From: Alfred Perlstein To: Gilles.Guerrini@alcatel.fr Cc: freebsd-questions@FreeBSD.ORG Subject: Re: mergemaster Message-ID: <20001211105219.B16205@fw.wintelcom.net> 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: bright@fw.wintelcom.net Sender: owner-freebsd-questions@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG * Gilles.Guerrini@alcatel.fr [001211 07:28] 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 ?? most likely install, but be careful. :) -- -Alfred Perlstein - [bright@wintelcom.net|alfred@freebsd.org] "I have the heart of a child; I keep it in a jar on my desk." To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message