This series adds two test cases for merge strategies. The first one test that something sensible is done in case of directory/file conflicts, the second one tests a criss-cross merge. - Fredrik - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htmlReceived on Sat Dec 03 21:33:56 2005
This archive was generated by hypermail 2.1.8 : 2005-12-03 21:34:02 EST