octopus-merge (part 5: tree-merge-ORT three-way)#1618

Merged

Byron merged 23 commits intomainfrom

Nov 2, 2024

Commits on Oct 31, 2024

fix: assure that `gix tree diff` doesn't slow down too much when shortening IDs
Byron
committed
Add a link to OpenCollective
Byron
committed
Improve error message to be less elusive

Byron
and
EliahKagan
committed
feat: Allow access to `tree::State::buf1|2`.
Byron
committed
feat: add `tree_with_rewrites::Change(Ref)::previous_location()`
Byron
committed
feat: add traits for partial equality comparison to `tree_with_rewrites::Change` types
Byron
committed
feat: Add `tree::Editor::get()` to get entries directly from the editor.
Byron
committed
fix!: prefer to receive borrowed `gix_command::Context` when it's just passed on.
Byron
committed
feat!: Don't fail on big files during blob-merge, but turn them into binary merges.
Byron
committed
feat: add `blob::PlatformRef::id_by_pick()` to more efficiently pick merge results.
Byron
committed
adapt to changes in `gix-merge`
Byron
committed