Re: [Gnu-arch-users] NEW: three-way merges / conflict markers

[Alexander Deruwe]

On Wed, Sep 24, 2003 at 01:04:22PM +0200, Jan Hudec wrote:
> On Wed, Sep 24, 2003 at 12:32:43 +0200, Alexander Deruwe wrote:
> > Any chance of getting a -t option in 'tla redo'?  The conflict markers
> > are much easier to work with, and I just found myself wishing 'redo'
> > would support them as well.
> 
> But you need wiggle for that...
> 
> Recall that you don't have the full text of old and new files for the
> patch; just the diff.

Ah, right.

Alexander