http://kdiff3.sourceforge.net/ ---- windows & mac binaries there too....
On Apr 20, 7:08 pm, Terry Brown <[EMAIL PROTECTED]> wrote: > On Sun, 20 Apr 2008 15:04:04 -0700 (PDT) > "Edward K. Ream" <[EMAIL PROTECTED]> wrote: > > > Creating the sax-graph branch was "interesting". There was quite a > > bit of manual work involved. > > I've found the visual merging utility kdiff3 quite useful. If you have > a bzr conflict which generates foo.THIS, foo.OTHER, and foo.BASE you can > use `kdiff3 foo.BASE foo.OTHER foo.THIS` (not sure on that ordering) and > use its merge command, then just resolve the conflicts by selecting A > or B. > > It's available in Ubuntu, you can use it even if you're using Gnome > (it's part of KDE). > > There are probably other tools that do the same thing, and you may be > using one. > > Cheers -Terry --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "leo-editor" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/leo-editor?hl=en -~----------~----~----~----~------~----~------~--~---
