Re: 3 way merge algorithm

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
http://www.dexa.org/dexa2004/index.php?include=main.php

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
anyway.

Torsten

---------------------------------------------------------------------
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