[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnu-arch-users] Re: Merge tools that support .rej .orig rejects/conflic
[Gnu-arch-users] Re: Merge tools that support .rej .orig rejects/conflicts
Tue, 14 Sep 2004 16:51:14 -0400
Gnus/5.1006 (Gnus v5.10.6) Emacs/21.3.50 (gnu/linux)
> 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.
Which cases are thinking of where --three-way can't be used and wiggle
doesn't do a good job?
> Hmmmmm. I guess it'll get better, but it is pretty sad at the moment.
What's sad about Emacs?
What kind of GUI tool are you imagining?
Currently with --three-way and wiggle, you can use xxdiff (which I warmly
recommend), and in the rare cases where wiggle doesn't do the job, I'm not
sure what kind of GUI tool could help. Or are thinking of an interactive
GUI form of wiggle (that's my dream for Emacs's diff-mode).