From owner-freebsd-questions Thu Jul 6 22:45:38 2000 Delivered-To: freebsd-questions@freebsd.org Received: from mostgraveconcern.com (mostgraveconcern.com [216.82.145.240]) by hub.freebsd.org (Postfix) with ESMTP id 00B5537B8D4 for ; Thu, 6 Jul 2000 22:45:35 -0700 (PDT) (envelope-from dan@mostgraveconcern.com) Received: from danco (danco.mostgraveconcern.com [10.0.0.2]) by mostgraveconcern.com (8.9.3/8.9.3) with SMTP id WAA09804; Thu, 6 Jul 2000 22:45:32 -0700 (PDT) (envelope-from dan@mostgraveconcern.com) Message-ID: <095401bfe7d6$906f63e0$0200000a@danco> Reply-To: "Dan O'Connor" From: "Dan O'Connor" To: "Matthew Cerha" , Subject: Re: mergemaster? Date: Thu, 6 Jul 2000 22:45:31 -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 4.72.3155.0 X-MimeOLE: Produced By Microsoft MimeOLE V4.72.3155.0 Sender: owner-freebsd-questions@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG >I found a reference to a port called mergemaster that supposedly makes >the process of merging changes into /etc easier. I looked for the port >in sysutils, but I cannot find it. Has it gone away? Starting with 3.4 (IIRC), it's in the base system (/usr/sbin/mergemaster)... --Dan -- Dan O'Connor On Matters of Most Grave Concern http://www.mostgraveconcern.com To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message