Subject: Re: LCA2006 Git/Cogito tutorial

From: Dmitry Torokhov <[email-masked]>
Date: Thu, 20 Oct 2005 21:37:21 -0500

On Thursday 20 October 2005 19:51, Petr Baudis wrote:
> (ii) You say:
> 
>         - Very fast stupid merge
>             ... and very smart, slow merges when stupid won't do
> 

He might be referring to manual merge which is indeed as smart as it gets :)

-- 
Dmitry