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

Name Size Rev Age Author Last Change
../
tags 1631   14 years Gubaer added support for merging member lists of relations in extended …
nodes 1650   14 years Gubaer added concept of "merge pairs" (my vs. merged, my vs. their, their vs. …
Note: See TracBrowser for help on using the repository browser.