Index: trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java	(revision 8549)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java	(revision 8565)
@@ -317,5 +317,4 @@
         their.addPrimitive(n1);
 
-
         DataSetMerger visitor = new DataSetMerger(my, their);
         visitor.merge();
@@ -324,5 +323,5 @@
         assertEquals(0, visitor.getConflicts().size());
         assertEquals("value1", n2.get("key1"));
-        assertTrue(n1.getTimestamp().equals(n2.getTimestamp()));
+        assertEquals(n1.getRawTimestamp(), n2.getRawTimestamp());
         assertEquals(theirUser, n2.getUser());
         assertSame(n2, n);
@@ -351,5 +350,4 @@
         their.addPrimitive(n1);
 
-
         DataSetMerger visitor = new DataSetMerger(my, their);
         visitor.merge();
@@ -358,5 +356,5 @@
         assertEquals(0, visitor.getConflicts().size());
         assertEquals("value1", n2.get("key1"));
-        assertTrue(n1.getTimestamp().equals(n2.getTimestamp()));
+        assertEquals(n1.getRawTimestamp(), n2.getRawTimestamp());
         assertFalse(n2.isIncomplete());
         assertSame(n2, n);
@@ -665,5 +663,5 @@
         assertEquals("their", merged.getUser().getName());
         assertEquals(1111, merged.getUser().getId());
-        assertEquals(theirWay.getTimestamp(), merged.getTimestamp());
+        assertEquals(theirWay.getRawTimestamp(), merged.getRawTimestamp());
         assertSame(merged, myWay);
         assertSame(merged.getNode(0), n1);
@@ -719,5 +717,5 @@
         assertEquals("their", merged.getUser().getName());
         assertEquals(1111, merged.getUser().getId());
-        assertEquals(theirWay.getTimestamp(), merged.getTimestamp());
+        assertEquals(theirWay.getRawTimestamp(), merged.getRawTimestamp());
         assertSame(merged, myWay);
         assertSame(merged.getNode(0), n1);