Jeff King <p...@peff.net> writes: > So the issue is that when you do a recursive merge with multiple bases, > the order in which you visit the recursive bases is going to impact the > exact conflicts you see.
Yeah, that explains it. > So the test is not broken or racy, which is good. It is just testing > something that is somewhat of an implementation detail. We could switch > it to use test_tick, and then adjust the expected output to look for the > expected conflict that git happens to generate in that case. But that is > no better than the current behavior. True. > But I'm not sure there is a way to test what it wants to test (that we > hit a conflict that involves one of the recursive merge bases) without > relying on the implementation detail. So I'm inclined to just leave it > in place. OK. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
