source: josm/trunk/test/unit/org/openstreetmap/josm/gui/conflict @ 1750

Name Size Rev Age Author Last Change
../
nodes 1650   13 years Gubaer added concept of "merge pairs" (my vs. merged, my vs. their, their vs. …
tags 1654   13 years Gubaer added merge support for coordinate conflicts added merge support for …
properties 1703   13 years Gubaer added test cases
Note: See TracBrowser for help on using the repository browser.