octopus-merge (part 3.5: gix-api and CLI)#1611

Merged

Sebastian Thiel (Byron) merged 7 commits intomainfrom

Sep 30, 2024

Commits on Sep 30, 2024

make `blob::Platform::filter_mode` public.
Sebastian Thiel (Byron)
committed
add all keys for merge-configuration
Sebastian Thiel (Byron)
committed
feat: `Repository::merge_resource_cache()` to obtain the foundation for merging files directly.
Sebastian Thiel (Byron)
committed
fix!: unify location of error type of `Repository::diff_resource_cache()`.
Sebastian Thiel (Byron)
committed
feat: add `Repository::blob_merge_options()` to obtain options for merging blobs and `Repository::diff_algorithm()`
Sebastian Thiel (Byron)
committed
feat: add `gix merge-file` with similar features as `git merge-file`
Sebastian Thiel (Byron)
committed
adjust journey tests to deal with merge command
Sebastian Thiel (Byron)
committed