On Mon, Feb 14, 2011 at 04:07:15PM +0000, Michael Meeks wrote: > Setup (some large repos): > > git clone git://anongit.freedesktop.org/libreoffice/libs-core > git checkout integration/dev300_m98 > git remote add stage git://anongit.freedesktop.org/libreoffice/staging/@REPO@ > git fetch stage > > Test[1]: > > git merge stage/premerge/dev300_m98 > git diff idl/source/cmptools/lex.cxx > > yields: > [a conflict in idl/source/cmptools/lex.cxx] > > With the above master hash; whereas with v1.7.3.4 it yields nothing (as > it should IMHO) - we havn't edited things around that chunk in master. 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. -Peff -- 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