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

[John A Meinel]

Aaron Bentley wrote:
> John A Meinel wrote:
>
> > gotcha. Because apply-delta grabs the pre and post to create the 
> > changeset, and the just applies that changeset. Silly me.
>
>
> I've been working on getting apply-delta --three-way working, but 
> somewhat hindered by the fact that you broke star-merge --three-way.
>
> Aaron

Who broke star-merge --three-way? I don't believe I did anything with 
it. (naturally, I could be wrong.)

And, of course, what is broken about it?

John
=:->

signature.asc
Description: OpenPGP digital signature