From owner-freebsd-questions@FreeBSD.ORG Sat Sep 6 17:28:14 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 80E751065675 for ; Sat, 6 Sep 2008 17:28:14 +0000 (UTC) (envelope-from msoulier@gmail.com) Received: from yx-out-2324.google.com (yx-out-2324.google.com [74.125.44.30]) by mx1.freebsd.org (Postfix) with ESMTP id 42FC98FC2A for ; Sat, 6 Sep 2008 17:28:14 +0000 (UTC) (envelope-from msoulier@gmail.com) Received: by yx-out-2324.google.com with SMTP id 8so495494yxb.13 for ; Sat, 06 Sep 2008 10:28:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from:sender :to:subject:mime-version:content-type:content-transfer-encoding :content-disposition:x-google-sender-auth; bh=mfn4tS4PmWrnooocUUps4BhmMNYZpaEQca4HC5iBE/Q=; b=PW0VT6XPFG2rlbHH4ZfYjtxppWcLoINM4IOMuEhjYZOo8JlkYmXXidRItY2kjFpZjW 09uR/vptMbtylzNqMnahG4a3BYgOgiMKxu44XSBCWTvA7Brs7wzCijBk+E+xd0pNk2xI KjF6TX9gnk+HG0folEO+NwBem1vj64inCMieQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:sender:to:subject:mime-version:content-type :content-transfer-encoding:content-disposition:x-google-sender-auth; b=aL9wzPTX6QoeovEYmIhR3Wd4azWcgM8UI5JLW3hwAqxHh/C8yLmPHpFUgDfMUcMp9p q1IYYvV804+HdNBM6HXmR3I0k/oAcEPo1HGLU+Viy+b8Ir0D6FIXchzkrk7Ukw/kSG8R ZZoHhy9S+Ztz2bdzi81LmGhXU66D/FLRi+tzc= Received: by 10.151.102.21 with SMTP id e21mr8635548ybm.106.1220722093539; Sat, 06 Sep 2008 10:28:13 -0700 (PDT) Received: by 10.151.142.19 with HTTP; Sat, 6 Sep 2008 10:28:13 -0700 (PDT) Message-ID: Date: Sat, 6 Sep 2008 13:28:13 -0400 From: "Michael P. Soulier" Sender: msoulier@gmail.com To: freebsd-questions MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline X-Google-Sender-Auth: d7c279fd6473aad9 Subject: alternatives to mergemaster 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, 06 Sep 2008 17:28:14 -0000 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'm using Git for development, and it's also tremendously good at merging. This makes me kick around ideas for how to integrate it into a freebsd upgrade. Thanks, Mike -- Michael P. Soulier "Any intelligent fool can make things bigger and more complex... It takes a touch of genius - and a lot of courage to move in the opposite direction." --Albert Einstein