Re: [Gnu-arch-users] Re: Merge tools that support .rej .orig rejects/conflicts

[Karel Gardas]

On Tue, 14 Sep 2004, Aaron Bentley wrote:

> Martin Langhoff wrote:
> > I was aware of wiggle, and I use it every so often, as well as
> > --three-way. It seems, however, that emacs (thanks Matthiew) is the
> > only gui for complex merges available.
>
> There are other tools, like meld or dirdiff

Personaly for GUI merge tool, I'm using xxdiff -- it is also able to do
whole dir diffs...

Cheers,

Karel
--
Karel Gardas                  address@hidden
ObjectSecurity Ltd.           http://www.objectsecurity.com