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

Re: 3 way merge algorithm

From: Torsten Rueger <torsten.rueger_at_hiit.fi>
Date: 2004-04-29 13:15:29 CEST

On 29 Apr 2004, at 06:50, Greg Hudson wrote:

> So, if you could write something up in more detail, I'd
> appreciate it.

The first part of the algorithm is basically like xdelta. That is
described in chapter 3.1 of

The second part really is as simple as it's said in my description, but
it maybe just needs some time to sink in. I didn't get it immediately


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Apr 29 13:16:24 2004

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.