From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sat, 30 Aug 2008 09:34:43 GMT
Subject: Re: [PATCH 04/12] xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or less
Message-ID: <alpine.DEB.1.00.0808301133550.24820@pacific.mpi-cbg.de.mpi-cbg.de>
In-Reply-To: <1220056963-2352-5-git-send-email-gitster@pobox.com>

Hi,

On Fri, 29 Aug 2008, Junio C Hamano wrote:

> Representing the last illustration like this is misleading to say the 
> least:
> 
>     output:      1234A<BCD|56=XY>E789   ; broken "diff3 -m" style
> 
> because the preimage was not ...4A56E... to begin with.  "A" and "E" are
> common only between the postimages.

Okay, I understand now.

Thanks,
Dscho