Changeset 1654 in josm for trunk/test/unit


Ignore:
Timestamp:
2009-06-07T23:22:54+02:00 (11 years ago)
Author:
Gubaer
Message:

added merge support for coordinate conflicts
added merge support for conflicts due to different deleted states

Location:
trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags
Files:
2 edited

Legend:

Unmodified
Added
Removed
Note: See TracChangeset for help on using the changeset viewer.