|
| From: | Stefan Monnier |
| Subject: | [Gnu-arch-users] Re: Merge tools that support .rej .orig rejects/conflicts |
| Date: | Mon, 13 Sep 2004 15:06:37 -0400 |
| User-agent: | Gnus/5.1006 (Gnus v5.10.6) Emacs/21.3.50 (gnu/linux) |
> 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.
Other than `star-merge --three-way' (which I warmly recommend) you might
want to Google for `wiggle': it's a neat tool that will apply a *.rej file,
generating diff-3 markers if nothing else seems to make sense.
Stefan
| [Prev in Thread] | Current Thread | [Next in Thread] |