Re: [Gnu-arch-users] diff markers/ star merge

[Zenaan Harkness]

On Mon, 2004-11-22 at 09:22, Dimitrie O. Paun wrote:
> On Sun, Nov 21, 2004 at 05:11:48PM -0500, Aaron Bentley wrote:
> > Zenaan Harkness wrote:
> > 
> > >So, I can tla undo, tla star-merge then tla redo, except when I tla redo
> > >I get the .rej conflict files rather than diff3 in-file markers.
> > 
> > I realize that .rej files may be unfamiliar, but now that I'm used to 
> > them, I find them quite readable.  The top half shows the text the patch 
> > was expecting, the bottom shows what the patch tried to turn it into.
> 
> Maybe, but I still like the inline markers a *lot* more. 
> How can one get them?

tla star-merge --three-way

And I fully agree - in-line markers are much more efficient on my time.
But I use vim, so I guess Emacsen users have better facilities (good for
them, sad for us).

cheers
zen