jj/lib/testutils
Martin von Zweigbergk 4f30417ffd merged_tree: introduce a type for a set of trees to merge on the fly
In order to store conflicts in the commit, as conflicts between a set
of trees, we want to be able merge those trees on the fly. This
introduces a type for that. It has a `Merge(Conflict(Tree))` variant,
where the individual trees cannot have path-level conflicts. It also
has a `Legacy(Tree)` variant, which does allow path-level conflicts. I
think that should help us with the migration.
2023-07-19 22:04:16 -07:00
..
src merged_tree: introduce a type for a set of trees to merge on the fly 2023-07-19 22:04:16 -07:00
Cargo.toml release: release version 0.8.0 2023-07-16 21:40:24 +01:00