From owner-freebsd-current@FreeBSD.ORG  Tue Dec 14 23:23:09 2004
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
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 1105516A4CE
	for <freebsd-current@freebsd.org>;
	Tue, 14 Dec 2004 23:23:09 +0000 (GMT)
Received: from mail.dt.e-technik.uni-dortmund.de
	(mail.dt.e-technik.Uni-Dortmund.DE [129.217.163.1])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2C43043D45
	for <freebsd-current@freebsd.org>;
	Tue, 14 Dec 2004 23:23:08 +0000 (GMT)
	(envelope-from ma@dt.e-technik.uni-dortmund.de)
Received: from localhost (localhost [127.0.0.1])4157949F05;
	Wed, 15 Dec 2004 00:23:07 +0100 (CET)
Received: from mail.dt.e-technik.uni-dortmund.de ([127.0.0.1])
 by localhost (krusty [127.0.0.1]) (amavisd-new, port 10024) with LMTP
 id 28876-02; Wed, 15 Dec 2004 00:23:06 +0100 (CET)
Received: from m2a2.dyndns.org (p508EF5E8.dip.t-dialin.net [80.142.245.232])
	7846A49EE9;	Wed, 15 Dec 2004 00:23:06 +0100 (CET)
Received: from localhost (localhost [127.0.0.1])
	by merlin.emma.line.org (Postfix) with ESMTP id 7737A79C4A;
	Wed, 15 Dec 2004 00:23:13 +0100 (CET)
Received: from merlin.emma.line.org ([127.0.0.1])
 by localhost (m2a2.dyndns.org [127.0.0.1]) (amavisd-new, port 10024)
 with LMTP id 04624-06; Wed, 15 Dec 2004 00:23:12 +0100 (CET)
Received: by merlin.emma.line.org (Postfix, from userid 500)
	id 8BA0279D5E; Wed, 15 Dec 2004 00:23:12 +0100 (CET)
From: Matthias Andree <ma@dt.e-technik.uni-dortmund.de>
To: Julian Elischer <julian@elischer.org>
In-Reply-To: <41BF6D42.7040508@elischer.org> (Julian Elischer's message of
	"Tue, 14 Dec 2004 14:46:26 -0800")
References: <41BF6D42.7040508@elischer.org>
Date: Wed, 15 Dec 2004 00:23:12 +0100
Message-ID: <m3hdmo4g7z.fsf@merlin.emma.line.org>
User-Agent: Gnus/5.110003 (No Gnus v0.3) Emacs/21.3 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-Virus-Scanned: by amavisd-new at dt.e-technik.uni-dortmund.de
cc: FreeBSD Current <freebsd-current@freebsd.org>
Subject: Re: 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
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 14 Dec 2004 23:23:09 -0000

Julian Elischer <julian@elischer.org> writes:

> 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?

emacs with its original "emerge" mode is worth looking into.

-- 
Matthias Andree