Index: trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergerTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergerTest.java	(revision 5556)
+++ trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergerTest.java	(revision 6264)
@@ -23,9 +23,9 @@
             n1.put("key" + i, "value" + i);
         }
-        String note = "";
+        StringBuilder note = new StringBuilder();
         for (int i=0; i < 50; i++) {
-            note += " A very long text ";
+            note.append(" A very long text ");
         }
-        n1.put("note", note);
+        n1.put("note", note.toString());
         w1.addNode(new Node(2));
         w1.addNode(new Node(3));