Index: trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java	(revision 626)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java	(revision 655)
@@ -315,5 +315,5 @@
 
 	/**
-	 * The merger should auto-resolve items, that have not changed but are marked as
+	 * The merger should auto-resolve items that have not changed but are marked as
 	 * changed. In the case where an unmodified newer item is merged over an modified
 	 * older, the modified-flag should be removed and the newer timestamp is used.
