[PATCH] xdiff: implement a zealous diff3

zdiff3 is identical to ordinary diff3, only it allows more aggressive compaction than diff3. This way the displayed base isn't necessary technically correct, but still this mode might help resolving merge conflicts between two near identical additions. Signed-off-by: Uwe Kleine-König

Re: [PATCH] xdiff: implement a zealous diff3

On Wed, Mar 06, 2013 at 09:36:42PM +0100, Uwe Kleine-König wrote: zdiff3 is identical to ordinary diff3, only it allows more aggressive compaction than diff3. This way the displayed base isn't necessary technically correct, but still this mode might help resolving merge conflicts between two