Re: LCA2006 Git/Cogito tutorial

From: Dmitry Torokhov <dtor_core@ameritech.net>
Date: 2005-10-21 12:37:21
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
-
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.html
Received on Fri Oct 21 12:38:24 2005

This archive was generated by hypermail 2.1.8 : 2005-10-21 12:38:28 EST