Index: trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java	(revision 1701)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java	(revision 1702)
@@ -103,5 +103,5 @@
 
     /**
-     * two  nodes, my is unmodified, their is updated and has a higherversion
+     * two  nodes, my is unmodified, their is updated and has a higher version
      * => their version is going to be the merged version
      * 
@@ -311,5 +311,5 @@
      * My and their node are new but semantically equal. Both are deleted.
      * 
-     * => create a conflict
+     * => take mine
      * 
      */
@@ -424,5 +424,5 @@
      * my node is incomplete, their node is complete
      * 
-     * => merge it onto my node. My node becoms complete
+     * => merge it onto my node. My node becomes complete
      * 
      */