From owner-freebsd-questions Fri Feb 2 6:55:26 2001 Delivered-To: freebsd-questions@freebsd.org Received: from ike-ext.ab.videon.ca (ike-ext.ab.videon.ca [206.75.216.35]) by hub.freebsd.org (Postfix) with SMTP id 18DB337B503 for ; Fri, 2 Feb 2001 06:54:57 -0800 (PST) Received: (qmail 2783 invoked from network); 2 Feb 2001 14:54:56 -0000 Received: from unknown (HELO e5e0aftd3903e) ([24.108.62.177]) (envelope-sender ) by ike-ext.ab.videon.ca (qmail-ldap-1.03) with SMTP for ; 2 Feb 2001 14:54:56 -0000 Message-ID: <004001c08d28$1b1b5c00$b13e6c18@videon.ca> From: "Paul Andrews" To: Subject: mergmaster Date: Fri, 2 Feb 2001 07:54:55 -0700 MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit X-Priority: 3 X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook Express 5.50.4522.1200 X-MIMEOLE: Produced By Microsoft MimeOLE V5.50.4522.1200 Sender: owner-freebsd-questions@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG Just a quick question as I know questions about mergemaster have come up before. I recently installed 4.2-RELEASE and have not made any modifications to the system from the install. I have just finished updating my kernel to 4.2-STABLE along with running make buildworld and installworld... I am now in the process of running mergemaster... My question is: Is it safe to replace the installed file with the file stored in temporary root or is it better to merge the two files together? Thank in advance. Paul Andrews Internet: andrews@powersurfr.com To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message