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

[Aaron Bentley]

Dimitrie O. Paun wrote:
> On Sun, Nov 21, 2004 at 05:11:48PM -0500, Aaron Bentley wrote:

> > 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?

If all you have is a changeset, it's theoretically impossible.

Currently, the only command that supports --three-way is star-merge, 
though there's no reason apply-delta couldn't.

Aaron