From owner-freebsd-current@FreeBSD.ORG Tue Dec 14 22:46:29 2004 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B28B616A552 for ; Tue, 14 Dec 2004 22:46:29 +0000 (GMT) Received: from mail.vicor-nb.com (bigwoop.vicor-nb.com [208.206.78.2]) by mx1.FreeBSD.org (Postfix) with ESMTP id 67EF743D54 for ; Tue, 14 Dec 2004 22:46:27 +0000 (GMT) (envelope-from julian@elischer.org) Received: from elischer.org (julian.vicor-nb.com [208.206.78.97]) by mail.vicor-nb.com (Postfix) with ESMTP id 325E67A425 for ; Tue, 14 Dec 2004 14:46:27 -0800 (PST) Message-ID: <41BF6D42.7040508@elischer.org> Date: Tue, 14 Dec 2004 14:46:26 -0800 From: Julian Elischer User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.3.1) Gecko/20030516 X-Accept-Language: en, hu MIME-Version: 1.0 To: FreeBSD Current Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Subject: looking for a merge tool. X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Dec 2004 22:46:29 -0000 I'm doing a bit of merging fromthe NetBSD USB code to -current, but I'm wonderring if anyone can point me to a good merge tool. I'm currently using mgdiff which shows the two files in adjoing panes with the differences coloured and allows you to select the diffs from the left or right windows. quite good until you need the third option, which is "both" or "the left, but with a small edit" does anyone know of a tool that gives 3 panes and allows manual editing of the merged product? Julian