Martin von Zweigbergk deb4ae476d merged_tree: add an iterator over conflicts ... With `MergedTree`, we can iterate over conflicts by descending into only the subdirectories that cannot be trivially resolved. We assume that the trees have previously been resolved as much as possible, so we don't attempt to resolve conflicts again.		2023-07-19 22:04:16 -07:00
..
benches	cargo: rename crates from jujutsu/jujutsu-lib to jj-cli/jj-lib	2023-07-09 06:40:43 +02:00
gen-protos	backend: split up store.proto in git and local versions	2023-06-22 13:49:46 +02:00
src	merged_tree: add an iterator over conflicts	2023-07-19 22:04:16 -07:00
tests	merged_tree: add an iterator over conflicts	2023-07-19 22:04:16 -07:00
testutils	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	cargo: bump the cargo-dependencies group with 2 updates	2023-07-19 11:30:15 -05:00