more merge features#1661

Merged

Byron merged 12 commits intomainfrom

Nov 24, 2024

Commits on Nov 24, 2024

feat: `entry::Stage` can now be converted into `entry::Flags`.
Byron
committed
fix: `tree()` diffing now also recognizes merge mode changes as modification.
Byron
committed
feat: octal Debug representation of `tree::EntryMode`.
Byron
committed
feat: add `gix merge commit --debug`
Byron
committed
fix: `Repository::tree_merge_options()` now comes with rewrite tracking.
Byron
committed
feat: add `tree_with_rewrites::Change(Ref)::source_mode_and_id|mode_and_id()`
Byron
committed
feat: provide a way to record and apply index changes.
Byron
committed
feat: Add support for `index` application in merge results via `merge::tree::Outcome::index_changed_after_applying_conflicts()`
Byron
committed