SZEDER Gábor wrote: > 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. Hmm. With that one reverted, git prints out this error instead: error: failed to create path 'after/one': perhaps a D/F conflict? and still has the moved file disapper in the working tree. The merge is successful, though, and the moved file is in the committed tree. Anders. -- 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
