[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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

From: John A Meinel
Subject: Re: [Gnu-arch-users] diff markers/ star merge
Date: Sun, 21 Nov 2004 21:03:53 -0600
User-agent: Mozilla Thunderbird 0.9 (Windows/20041103)

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.


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?


Attachment: signature.asc
Description: OpenPGP digital signature

reply via email to

[Prev in Thread] Current Thread [Next in Thread]