[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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

From: Matthieu Moy
Subject: Re: [Gnu-arch-users] Merge tools that support .rej .orig rejects/conflicts
Date: Mon, 13 Sep 2004 17:47:12 +0200
User-agent: Gnus/5.1002 (Gnus v5.10.2) Emacs/21.2 (gnu/linux)

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:

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


reply via email to

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