|
| From: | Aaron Bentley |
| Subject: | Re: [Gnu-arch-users] diff markers/ star merge |
| Date: | Sun, 21 Nov 2004 21:48:32 -0500 |
| User-agent: | Mozilla Thunderbird 0.8 (X11/20040926) |
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
| [Prev in Thread] | Current Thread | [Next in Thread] |