|
From: | Stefan Monnier |
Subject: | [Gnu-arch-users] Re: Merge tools that support .rej .orig rejects/conflicts |
Date: | Wed, 15 Sep 2004 12:09:07 -0400 |
User-agent: | Gnus/5.1006 (Gnus v5.10.6) Emacs/21.3.50 (gnu/linux) |
> wiggle is good, but non-interactive. What I am lacking is xxdiff or > meld supporting .rej. But if you use wiggle+xxdiff you get an interactive tool. And while you're using this solution, you can send a feature request to xxdiff's author (tell him I sent you ;-) Stefan
[Prev in Thread] | Current Thread | [Next in Thread] |