Jeff King <peff@xxxxxxxx> writes: > Interesting. I looked at both sides of the merge and the merge base, and > there definitely should not be a conflict there. The regression bisects > to 83c9031 (unpack_trees(): skip trees that are the same in all input, > 2010-12-22). Reverting that commit makes the problem go away. Thanks; I was wondering about this myself but you bisected it faster. Will revert. -- 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