From: Raimund Bauer <ray007@gmx.net>
Date: Tue, 11 Nov 2008 10:06:40 GMT
Subject: Re: JGIT: discuss: diff/patch implementation
Message-ID: <1226398000.7541.11.camel@minastirith.xtradesoft.lan>
In-Reply-To: <7v63mv5mro.fsf@gitster.siamese.dyndns.org>


On Mon, 2008-11-10 at 12:50 -0800, Junio C Hamano wrote:
> Francis Galiegue <fg@one2team.net> 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