Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> writes: > Sorry. I didn't even realize people did this. Oops. This is no big deal. It would have triggered if you are using resolve strategy _and_ did a multi merge-base merge, the former of which is quite unusual these days. > What *is* the behaviour for four trees? Reading "unpack_trees()" source > implies that all other trees go into stage 1, where the first matching > entry is used? Documentation/technical/trivial-merge.txt describes this under three-way case. Essentially this was an attempt to extend the original merge-resolve so that it would catch problematic criss-cross cases (case #16 in the description). - 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
