[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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

From: Karel Gardas
Subject: Re: [Gnu-arch-users] Re: Merge tools that support .rej .orig rejects/conflicts
Date: Tue, 14 Sep 2004 14:03:51 +0200 (CEST)

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


Karel Gardas                  address@hidden
ObjectSecurity Ltd. 

reply via email to

[Prev in Thread] Current Thread [Next in Thread]