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

[James Blackwell]

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

Aaron Bentley:
> There are other tools, like meld or dirdiff

I tried meld the other day, after vimdiff ended up hopelessly confused
on a patch. Not only did it do a better job of representing what went
where, but it also worked on entire directories. 

-- 
James Blackwell          Try something fun: For the next 24 hours, give
Smile more!              each person you meet a compliment!

GnuPG (ID 06357400) AAE4 8C76 58DA 5902 761D  247A 8A55 DA73 0635 7400