Changeset 1622 in josm for trunk/test

Timestamp:

2009-05-26T21:44:31+02:00 (16 years ago)

Author:

Gubaer

Message:

first version of extended conflict resolution dialog.

Location:

trunk/test

Files:

• . (added)
• unit (added)
• unit/org (added)
• unit/org/openstreetmap (added)
• unit/org/openstreetmap/josm (added)
• unit/org/openstreetmap/josm/gui (added)
• unit/org/openstreetmap/josm/gui/conflict (added)
• unit/org/openstreetmap/josm/gui/conflict/nodes (added)
• unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java (added)
• unit/org/openstreetmap/josm/gui/conflict/tags (added)
• unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeItemTest.java (added)
• unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java (added)