From owner-freebsd-questions@FreeBSD.ORG Sat Sep 1 11:39:52 2007 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C578E16A420 for ; Sat, 1 Sep 2007 11:39:52 +0000 (UTC) (envelope-from peter@boosten.org) Received: from smtpq2.groni1.gr.home.nl (smtpq2.groni1.gr.home.nl [213.51.130.201]) by mx1.freebsd.org (Postfix) with ESMTP id 6B0E913C4A5 for ; Sat, 1 Sep 2007 11:39:52 +0000 (UTC) (envelope-from peter@boosten.org) Received: from [213.51.130.189] (port=43612 helo=smtp2.groni1.gr.home.nl) by smtpq2.groni1.gr.home.nl with esmtp (Exim 4.30) id 1IRRKG-0001w8-6f; Sat, 01 Sep 2007 13:39:40 +0200 Received: from cp268254-a.landg1.lb.home.nl ([213.51.103.48]:4972 helo=ra.egypt.nl) by smtp2.groni1.gr.home.nl with esmtp (Exim 4.30) id 1IRRKD-0004s0-Il; Sat, 01 Sep 2007 13:39:37 +0200 Received: from ra.egypt.nl (localhost.egypt.nl [127.0.0.1]) by ra.egypt.nl (Postfix) with ESMTP id E86B0398B6; Sat, 1 Sep 2007 13:39:36 +0200 (CEST) Received: by ra.egypt.nl (Postfix, from userid 501) id 9F795398AB; Sat, 1 Sep 2007 13:39:36 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.2.3 (2007-08-08) on ra.egypt.nl X-Spam-Level: X-Spam-Status: No, score=-1.3 required=5.0 tests=ALL_TRUSTED, AWL autolearn=ham version=3.2.3 Received: from [127.0.0.1] (xp.egypt.nl [192.168.13.35]) by ra.egypt.nl (Postfix) with ESMTP id F34C339885; Sat, 1 Sep 2007 13:39:34 +0200 (CEST) Message-ID: <46D94F75.70805@boosten.org> Date: Sat, 01 Sep 2007 13:39:33 +0200 From: Peter Boosten User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.0.4) Gecko/20060516 Thunderbird/1.5.0.4 Mnenhy/0.7.4.666 MIME-Version: 1.0 To: Grant Peel , freebsd-questions@freebsd.org References: <012301c7ec8a$da6bfa60$6501a8c0@GRANT> <20070901113157.GA69446@owl.midgard.homeip.net> In-Reply-To: <20070901113157.GA69446@owl.midgard.homeip.net> X-Enigmail-Version: 0.95.3 OpenPGP: url=http://www.boosten.org/content/view/49/47/ Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Antivirus: avast! (VPS 000770-2, 09/01/2007), Outbound message X-Antivirus-Status: Clean X-Virus-Scanned: ClamAV using ClamSMTP X-AtHome-MailScanner-Information: Please contact support@home.nl for more information X-AtHome-MailScanner: Found to be clean Cc: Subject: Re: Last CVSup question. X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Sep 2007 11:39:52 -0000 Erik Trulsson wrote: > On Sat, Sep 01, 2007 at 07:25:51AM -0400, Grant Peel wrote: >> I have always found the mergemaster process confusing. > > Mergemaster is very useful tool for updating those files. > Updating: yes, but I never managed to merge two files successfully and always end up making the modifications manually. Peter -- http://www.boosten.org