Changeset 1702 in josm for trunk/test/unit/org/openstreetmap

Timestamp:

2009-06-27T02:30:28+02:00 (15 years ago)

Author:

Gubaer

Message:

cosmetics

File:

• trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java

@@ -103 +103 @@
 
     /**
-     * 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 +311 @@
      * My and their node are new but semantically equal. Both are deleted.
      * 
-     * => create a conflict
+     * => take mine
      * 
      */
@@ -424 +424 @@
      * 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
      * 
      */