From: Horst von Brand <vonbrand@inf.utfsm.cl>
Date: Sun, 23 Oct 2005 15:35:53 GMT
Subject: Re: LCA2006 Git/Cogito tutorial
Message-ID: <200510231535.j9NFZrmD019309@inti.inf.utfsm.cl>
In-Reply-To: <pasky@suse.cz>

Petr Baudis <pasky@suse.cz> wrote:

[...]

> Well, it's true that cg-Xmergefile still does not handle all merge
> cases, but it certainly will not be silent about it, at least. ;-)

The Codeville <http://www.codeville.org> people seem to have taken a hard
look at merging, but I don't find any clear references to their algorithm.
-- 
Dr. Horst H. von Brand                   User #22616 counter.li.org
Departamento de Informatica                     Fono: +56 32 654431
Universidad Tecnica Federico Santa Maria              +56 32 654239
Casilla 110-V, Valparaiso, Chile                Fax:  +56 32 797513