octopus-merge (part 2: blob-merge)#1585

Merged

Byron merged 10 commits intomainfrom

Sep 30, 2024

Commits on Sep 27, 2024

Implement `text` and `binary` merge algorithms, also with baseline tests for correctness.
Byron
committed
fix: `ValueRef::as_bstr()` now uses the correct lifetime.
Byron
committed
improve docs around worktree-filters and renormalization
Byron
committed

Commits on Sep 29, 2024

add all relevant tests for the merge processing pipeline
Byron
committed

Commits on Sep 30, 2024

add platform tests and implementation
Byron
committed