mirror of
https://github.com/nlohmann/json.git
synced 2026-10-01 05:23:47 +07:00
Conflicts: - include/nlohmann/json.hpp: kept the PR's diff_recursively()/ diff_object_keys() split and re-applied develop's #5691 (fast path for every object type except an insertion-ordered one; target key order only tracked for such types) inside diff_object_keys(), so both the recursive and the iterative walk get it - single_include/nlohmann/json.hpp: regenerated with make amalgamate - tests/src/unit-json_patch.cpp: kept both new test cases (deeply nested diff from the PR, #5639 regression from develop) Signed-off-by: Niels Lohmann <mail@nlohmann.me>