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 -- 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
