Date: Wed, 15 Dec 2004 00:23:12 +0100 From: Matthias Andree <ma@dt.e-technik.uni-dortmund.de> To: Julian Elischer <julian@elischer.org> Cc: FreeBSD Current <freebsd-current@freebsd.org> Subject: Re: looking for a merge tool. Message-ID: <m3hdmo4g7z.fsf@merlin.emma.line.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>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?m3hdmo4g7z.fsf>