Martin von Zweigbergk 5733e3a442 conflicts: introduce generic type for conflicts ... For support for tree-level conflicts (#1624), I'm probably going to introduce a `MergedTree` type representing a set of trees to merge. That will be similar to `Tree`, but instead of having values of type `TreeValue`, it will have values that can represent a single state or a conflict. The `TreeValue` type itself will eventually lose its `Conflict` variant. To prepare for that, this commit introduces a `Conflict<T>` type. That type is intended to be close to what the future `MergedTree::path_value()`, `MergedTree::entries()`, etc. The next few commits will replace most current uses of `backend::Conflict` by this new `conflicts::Conflict` type. They will use `Option<TreeValue>` as type parameter. Unlike the current `backend::Conflict` type, the explicit tracking of `None` values will let us better preserve the ordering and tying it to the tree-level conflict's order.		2023-06-04 06:48:34 -07:00
..
benches	benches: group unchanged/modified/reversed-line diffs together	2023-03-27 23:38:56 +09:00
gen-protos	cargo: bump prost-build from 0.11.8 to 0.11.9	2023-04-14 16:11:09 +00:00
src	conflicts: introduce generic type for conflicts	2023-06-04 06:48:34 -07:00
tests	dag_walk: rename bfs() to dfs() because it's depth-first	2023-06-04 11:47:49 +09:00
testutils	cargo: bump git2 from 0.17.1 to 0.17.2	2023-05-29 20:25:04 +02:00
build.rs
Cargo.toml	cargo: bump criterion from 0.4.0 to 0.5.1	2023-06-01 09:20:14 -07:00