Hi, On Thu, 15 Feb 2007, Junio C Hamano wrote: > * I wonder how recent merge-recursive with multiple merge bases > (or an empty one) ever worked with this bug. Am I > hallucinating? Probably the fact helped that merge-recursive only pretends zero-sized blobs. Ciao, 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