From: Dmitry Torokhov <dtor_core@ameritech.net>
Date: Fri, 21 Oct 2005 02:37:21 GMT
Subject: Re: LCA2006 Git/Cogito tutorial
Message-ID: <200510202137.22311.dtor_core@ameritech.net>
In-Reply-To: <20051021005145.GB30889@pasky.or.cz>

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