>>>>> "LT" == Linus Torvalds <[EMAIL PROTECTED]> writes:
LT> Anyway, with the modified read-tree, as far as I can tell it will now LT> merge all the cases where one side has done something to a file, and the LT> other side has left it alone (or where both sides have done the exact same LT> modification). That should _really_ cut down the cases to just a few files LT> for most of the kernel merges I can think of. LT> Does it do the right thing for your tests? Yes. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html