Re: looking for a merge tool.

From: Julian Elischer <julian_at_elischer.org>
Date: Wed, 15 Dec 2004 14:11:17 -0800
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_at_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
>>    
>>
Received on Wed Dec 15 2004 - 21:11:18 UTC

This archive was generated by hypermail 2.4.0 : Wed May 19 2021 - 11:38:24 UTC