Date: Tue, 14 Dec 2004 14:46:26 -0800 From: Julian Elischer <julian@elischer.org> To: FreeBSD Current <freebsd-current@freebsd.org> Subject: looking for a merge tool. Message-ID: <41BF6D42.7040508@elischer.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?41BF6D42.7040508>