Date: Wed, 15 Dec 2004 14:11:17 -0800 From: Julian Elischer <julian@elischer.org> To: Matthias Andree <ma@dt.e-technik.uni-dortmund.de> Cc: FreeBSD Current <freebsd-current@freebsd.org> Subject: Re: looking for a merge tool. Message-ID: <41C0B685.6050203@elischer.org> In-Reply-To: <m3hdmo4g7z.fsf@merlin.emma.line.org> References: <41BF6D42.7040508@elischer.org> <m3hdmo4g7z.fsf@merlin.emma.line.org>
next in thread | previous in thread | raw e-mail | index | archive | help
And the winner is: a tool Bob Willcox wrote called "tkmerge" Absolutly the EXACT right tool for the job. Two panes for sources, a 3rd for the output and a 4th for control and additional change editing that you might need to tailor teh diff you have selected. Bob, A port of this app would be brilliant! maybe one of the ports guru's can help you knock up a small port for the ports/packages collection. Matthias Andree wrote: >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 >> bob's email: >>Hi Julian, >> >>Here is a tk based program (two files attached) that I wrote a few years >>back that might do what you want. It is similar to your description of >>mgdiff but includes a "Both" and "Editor" button to let you select both >>or to edit both with your favorite editor. You may need to edit the >>third line of tkmerge, depending on which version of wish you have. It >>should work with any recent (in the past 5 years) version. >> >>Let me know how it works for you... >> >>Bob >> >>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?41C0B685.6050203>