Index: trunk/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java	(revision 11171)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java	(revision 11175)
@@ -3,4 +3,5 @@
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -12,4 +13,5 @@
 import org.openstreetmap.josm.actions.upload.CyclicUploadDependencyException;
 import org.openstreetmap.josm.data.APIDataSet;
+import org.openstreetmap.josm.data.conflict.ConflictCollection;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -104,4 +106,11 @@
         assertEquals(1, toUpdate.size());
         assertEquals(r4, toUpdate.get(0));
+
+        final ConflictCollection cc4 = new ConflictCollection();
+        cc4.add(r4, r4);
+        assertTrue(apiDataSet.participatesInConflict(cc4));
+        final ConflictCollection cc1 = new ConflictCollection();
+        cc1.add(r1, r1);
+        assertFalse(apiDataSet.participatesInConflict(cc1));
     }