100644 blob 8af78bd46e9479f9802d63be0705ee864b8b48e6	AllConflictDetectionTests.java
100644 blob 6493f3b9264ca3f31a580331622ed8be7e80ad68	ConflictDetectionAttributeTest.java
100644 blob a8fbfda894ddc4dfe822c1ac3311f57ca1eedb03	ConflictDetectionCreateTest.java
100644 blob 0eb2a75e764ae1ae5357ecf4bc1d404ce8b49547	ConflictDetectionDeleteTest.java
100644 blob 5673bcd2c761cbda4f0df3fca7bd328bd8050c02	ConflictDetectionMapTest.java
100644 blob 7cd25b00a5729fd010837ea9d958ee377f6a6e8e	ConflictDetectionMultiAttributeTest.java
100644 blob f6a3f0efc3547799153c369e27a218f7a998aade	ConflictDetectionMultiReferenceTest.java
100644 blob 74107515f4cb12c09bce753f2ee9181cb2d77256	ConflictDetectionReferenceTest.java
100644 blob a63f9344e154eba2bbda758eafe4bf0288583897	ConflictDetectionTest.java
040000 tree b9f28be5dc5bf77e7fe90066f9b1a5cfd8491993	merging