[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: |
Martin Langhoff |
|
Subject: |
Re: [Gnu-arch-users] Re: Merge tools that support .rej .orig rejects/conflicts |
|
Date: |
Tue, 14 Sep 2004 14:52:28 +1200 |
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.
Hmmmmm. I guess it'll get better, but it is pretty sad at the moment.
cheers,
martin