On Mon, 2008-11-10 at 12:50 -0800, Junio C Hamano wrote: > Francis Galiegue <fg@xxxxxxxxxxxx> writes: > > > A very nice git feature, without even going as far as merges, is the cherry > > pick feature. > > I thought cherry-picking needs to be done in terms of 3-way merge, not > diff piped to patch, for correctness's sake. What about http://sourceforge.net/projects/jlibdiff ? Maybe a bit old, but claims to have diff3 and is under LGPL. best regards, Ray -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
