Re: [PATCH 04/12] xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or less
From: Johannes Schindelin <hidden> Date: 2016-06-15 22:45:15
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.