From owner-freebsd-questions@FreeBSD.ORG Sat Sep 6 18:20:10 2008 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 CEA541065670 for ; Sat, 6 Sep 2008 18:20:10 +0000 (UTC) (envelope-from xi@borderworlds.dk) Received: from kazon.borderworlds.dk (kazon.borderworlds.dk [213.239.213.48]) by mx1.freebsd.org (Postfix) with ESMTP id 93E688FC1F for ; Sat, 6 Sep 2008 18:20:10 +0000 (UTC) (envelope-from xi@borderworlds.dk) Received: from dominion.borderworlds.dk (localhost [127.0.0.1]) by kazon.borderworlds.dk (Postfix) with ESMTP id 1565F17016; Sat, 6 Sep 2008 20:20:09 +0200 (CEST) Received: by dominion.borderworlds.dk (Postfix, from userid 2000) id 1BE9A478; Sat, 6 Sep 2008 20:20:08 +0200 (CEST) To: freebsd-questions@freebsd.org References: From: Christian Laursen Date: Sat, 06 Sep 2008 20:20:07 +0200 In-Reply-To: (Michael P. Soulier's message of "Sat\, 6 Sep 2008 13\:28\:13 -0400") Message-ID: User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.1 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: "Michael P. Soulier" Subject: Re: alternatives to mergemaster X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-questions@freebsd.org List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Sep 2008 18:20:10 -0000 "Michael P. Soulier" writes: > The downside of mergemaster is that it is only a 2-way merge, where a > 3-way would know better than you prompt you for changes that you > didn't make. This makes mergemaster far more tedious than it has to > be. Has anyone considered a good 3-way merge tool? I always run mergemaster in auto upgrade mode. From the man page: -U Attempt to auto upgrade files that have not been user modi- fied. This can also be achieved by putting "AUTO_UPGRADE=yes" in /etc/mergemaster.rc. Combined with auto install, mergemaster requires little effort. -- Christian Laursen