[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Merging multi-source copy/move into the merge-tracking branch

From: Daniel L. Rall <dlr_at_finemaltcoding.com>
Date: 2006-12-26 20:17:17 CET

On Thu, 21 Dec 2006, Daniel Rall wrote:

> Hyrum and Madan, there were some conflicts on the merge-tracking after
> I merged in the multi-source copy/move code from trunk. I think I've
> got a reasonable resolution approach here, but was hoping you could
> verify with the attached patch. Look for "mergeinfo" in the diff.

This is all merged into the merge-tracking branch. Thanks for the
eyes, Hyrum and Madan.

  • application/pgp-signature attachment: stored
Received on Tue Dec 26 20:18:42 2006

This is an archived mail posted to the Subversion Dev mailing list.