gnu-arch-users
[Top][All Lists]
Advanced
[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: Aaron Bentley
Subject: Re: [Gnu-arch-users] Re: Merge tools that support .rej .orig rejects/conflicts
Date: Tue, 14 Sep 2004 07:34:37 -0400
User-agent: Mozilla Thunderbird 0.5 (X11/20040306) 
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

Aaron
reply via email to
[Prev in Thread] Current Thread [Next in Thread]