Hi, r1631 now includes an experimental extended dialog for resolving conflicts, see http://josm.openstreetmap.de/browser/trunk/src/org/openstreetmap/josm/gui/co nflict
The traditional dialog is still there and it is enabled per default. If you want to use the new dialog and its support for merging node lists of ways and member lists of relations you have to update your preferences: conflict.resolution=extended new, extended dialog is being used conflict.resolution=traditional traditional dialog is being used (no support for merging ways and relations) Regards Karl _______________________________________________ josm-dev mailing list josm-dev@openstreetmap.org http://lists.openstreetmap.org/listinfo/josm-dev
