Merge branch 'develop' into claude/iterative-diff

Browse Source

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>

...

This commit is contained in:

Niels Lohmann

2026-09-30 20:36:43 +02:00

parent 90f85d6d75 6a073dbae4

commit 795ce4e4a7

89 changed files with 5619 additions and 645 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

single_include/nlohmann/json.hpp

+1424 -291

File diff suppressed because it is too large Load Diff