Changeset 1692 in josm for trunk/src/org/openstreetmap/josm/data
- Timestamp:
- 2009-06-24T21:03:17+02:00 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java
r1690 r1692 246 246 merged.put(other, my); 247 247 } else if (! my.modified && !other.modified) { 248 // nothing to merge248 // both not modified. Keep mine 249 249 // 250 250 merged.put(other,my); 251 } else if (my.modified && ! other.modified && my.version == other.version) { 252 // my is same as other but mine is modified 253 // => keep mine 254 merged.put(other, my); 251 255 } else if (my.deleted != other.deleted) { 252 256 // if we get here my is modified. Differences in deleted state
Note:
See TracChangeset
for help on using the changeset viewer.