Changeset 1702 in josm


Ignore:
Timestamp:
Jun 27, 2009 2:30:28 AM (4 years ago)
Author:
Gubaer
Message:

cosmetics

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r1701 r1702  
    103103 
    104104    /** 
    105      * two  nodes, my is unmodified, their is updated and has a higherversion 
     105     * two  nodes, my is unmodified, their is updated and has a higher version 
    106106     * => their version is going to be the merged version 
    107107     *  
    … …  
    311311     * My and their node are new but semantically equal. Both are deleted. 
    312312     *  
    313      * => create a conflict 
     313     * => take mine 
    314314     *  
    315315     */ 
    … …  
    424424     * my node is incomplete, their node is complete 
    425425     *  
    426      * => merge it onto my node. My node becoms complete 
     426     * => merge it onto my node. My node becomes complete 
    427427     *  
    428428     */ 
Note: See TracChangeset for help on using the changeset viewer.