On 22/07/13 03:06PM, Junio C Hamano wrote: > > How confident are you with the "leftabove" stuff? Is it solid > enough that it is safe to assume that we can queue this fix on top > of it? > I would say yes. I have been testing it since without problems. But it is also true that the "leftabove" patch fixes a corner case that can wait until the next release. I will keep testing it in any case and let you know if I find a case where it doesn't work.