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 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htmlReceived on Mon Oct 24 04:49:31 2005
This archive was generated by hypermail 2.1.8 : 2005-10-24 04:49:35 EST