If you need help with the merge, I'd be happy to lend a hand.
There is a report in the JOSM tracker (http://josm.openstreetmap.de/ticket/3721) that the patch which Fabrice is talking about doesn't quite work with 2255, that should probably be investigated :)
Neil,
If you need help with the merge, I'd be happy to lend a hand.
There is a report in the JOSM tracker (http:// josm.openstreet map.de/ ticket/ 3721) that the patch which Fabrice is talking about doesn't quite work with 2255, that should probably be investigated :)
/ Matt