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

[Matthieu Moy]

Martin Langhoff <address@hidden> writes:

> Hallo,
>
> dealing with conflicts in merges is proving somewhat tricky for this
> CVS refugee. I haven't been able to find how to make xxdiff or mgdiff
> (or meld, or imediff2 or whatever) deal with .rej files.
>
> Granted, there's a lot that can be done with a wrapper script... but
> isn't there one already?

Not answering precisely to your question, but Emacs can also help you:

http://wiki.gnuarch.org/moin.cgi/Process_20_2a_2erej_20files

Also, as a "CVS refugee", you may prefer "star-merge --three-way" to
update/replay/apply-delta when applicable.

-- 
Matthieu