Hi, On Fri, 8 May 2009, Dave O wrote: > On Fri, 8 May 2009, Dave O wrote: > > > Once again, I don't really know what the implications of the index > > operations that are happening here are, but the update_stages() call > > in a recursive merge must be doing surprising. > > After writing this, I took another look around merge-recursive.c, and > realized that all the calls to update_stages() except this one were > careful only to do it when o->call_depth was 0. This simple patch seems > to fully rectify the problem. ACK. Could you provide a commit message saying that call_depth > 0 requires trees to be constructed from the files with conflicts and that the stages thusly must not be updated? Oh, and you may want to adjust the test I made from your script (you said you made it shorter, but you made the original version shorter, which does not run in the test suite unmodified). And then a Signed-off-by, and you're good to go! Sorry for my lousy attempt to help... 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