On Thu, Nov 13, 2008 at 06:06:52PM +0100, Anders Melchiorsen wrote: > SZEDER Gábor wrote: > > It doesn't matter. The test script errors out at the merge, and not > > at the checkout. Furthermore, it doesn't matter, whether HEAD~, > > HEAD~, or HEAD^ is checked out, the results are the same. > > Just to be sure, I tried reverting the commit that you bisected -- and my > test case still fails. Well, oddly enough, your second test case behaves somewhat differently than the first one, at least as far as bisect is concerned. Bisect nails down the second test case to 0d5e6c97 (Ignore merged status of the file-level merge, 2007-04-26; put Alex on Cc). Reverting this commit on master makes both of your test cases pass. Gábor -- 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
