looking for a merge tool.

[Bob Willcox]

On Wed, Dec 15, 2004 at 02:11:17PM -0800, Julian Elischer wrote:
> 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.

I would be happy to help with this. Having never done a port, however,
I'm sure I will require some guidance.

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

-- 
Bob Willcox             We may not return the affection of those who like
bob at immure.com          us, but we always respect their good judgement.
Austin, TX
_______________________________________________
freebsd-current at freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-current
To unsubscribe, send any mail to "freebsd-current-unsubscribe at freebsd.org"