Merge branch 'develop' into claude/iterative-diff

Signed-off-by: Niels Lohmann <mail@nlohmann.me>

tests/src/unit-merge_patch.cpp

@@ -62,7 +62,7 @@ std::string nested_objects(const std::size_t depth, const int variant)
         }
         text += "\"a\":";
     }
-    text += variant == 1 ? "{\"x\":1,\"y\":null}" : "{\"y\":2}";
+    text += variant == 1 ? R"({"x":1,"y":null})" : "{\"y\":2}";
     text.append(depth, '}');
     return text;
 }

tests/src/unit-modifiers.cpp

@@ -48,7 +48,7 @@ std::string nested_objects(const std::size_t depth, const int variant)
         if (variant == 2 && i % 5 == 0)
         {
             // an object replacing a primitive, which is not merged
-            text += "\"s0\":{\"o\":1},";
+            text += R"("s0":{"o":1},)";
         }
         text += "\"a\":";
     }