From owner-freebsd-questions Mon Dec 11 7:28:29 2000 From owner-freebsd-questions@FreeBSD.ORG Mon Dec 11 07:28:27 2000 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mel.alcatel.fr (mel.alcatel.fr [212.208.74.132]) by hub.freebsd.org (Postfix) with ESMTP id B1D3437B400 for ; Mon, 11 Dec 2000 07:28:26 -0800 (PST) Received: from aifhs2.alcatel.fr (mailhub.alcatel.fr [155.132.180.80]) by mel.alcatel.fr (ALCANET/SMTP) with ESMTP id QAA02106 for ; Mon, 11 Dec 2000 16:28:09 +0100 From: Gilles.Guerrini@alcatel.fr Received: from frmail19.netfr.alcatel.fr (frmail19.netfr.alcatel.fr [155.132.251.19]) by aifhs2.alcatel.fr (ALCANET/SMTP2) with SMTP id QAA03546 for ; Mon, 11 Dec 2000 16:24:29 +0100 (MET) Received: by frmail19.netfr.alcatel.fr(Lotus SMTP MTA v4.6.7 (934.1 12-30-1999)) id C12569B2.0054FAAC ; Mon, 11 Dec 2000 16:28:11 +0100 X-Lotus-FromDomain: ALCATEL To: freebsd-questions@FreeBSD.ORG Message-ID: Date: Mon, 11 Dec 2000 16:28:06 +0100 Subject: mergemaster Mime-Version: 1.0 Content-type: text/plain; charset=us-ascii Content-Disposition: inline Sender: owner-freebsd-questions@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG 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. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message