Changeset 1702 in josm for trunk/test
- Timestamp:
- 2009-06-27T02:30:28+02:00 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java
r1701 r1702 103 103 104 104 /** 105 * two nodes, my is unmodified, their is updated and has a higher version105 * two nodes, my is unmodified, their is updated and has a higher version 106 106 * => their version is going to be the merged version 107 107 * … … 311 311 * My and their node are new but semantically equal. Both are deleted. 312 312 * 313 * => create a conflict313 * => take mine 314 314 * 315 315 */ … … 424 424 * my node is incomplete, their node is complete 425 425 * 426 * => merge it onto my node. My node becom s complete426 * => merge it onto my node. My node becomes complete 427 427 * 428 428 */
Note:
See TracChangeset
for help on using the changeset viewer.