fix #5680 - IndexOutOfBoundsException when resolving a conflict on untagged primitive

git-svn-id: http://josm.openstreetmap.de/svn/trunk@5932 0c6e7542-c601-0410-84e7-c038aed88b3b
Merge branch 'master' into mirror