[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: Wed, 15 Sep 2004 13:45:57 +1200

> > Hmmmmm.  I guess it'll get better, but it is pretty sad at the moment.
> What's sad about Emacs?

nothing sad about emacs! A bit sad,however, the lack of wider support.

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

wiggle is good, but non-interactive. What I am lacking is xxdiff or
meld supporting .rej. Now James Blackwell answered saying he's used
meld, James, did meld support .rej files? How?



reply via email to

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