Yuya Nishihara 2c128f1b61 merged_tree: convert from legacy conflicts through interleaved list ... This is basically the same change as the previous commit.		2023-11-07 17:10:12 +09:00
..
benches	cargo: rename crates from jujutsu/jujutsu-lib to jj-cli/jj-lib	2023-07-09 06:40:43 +02:00
gen-protos	Use { workspace = true } to appease VS Code's Cargo.toml parser	2023-08-22 21:38:53 -07:00
src	merged_tree: convert from legacy conflicts through interleaved list	2023-11-07 17:10:12 +09:00
tests	merge: add Merge constructor that accepts interleaved values	2023-11-07 17:10:12 +09:00
testutils	merged_tree: let backend influence whether to use new diff algo	2023-11-06 23:12:02 -08:00
Cargo.toml	async: switch to pollster's block_on()	2023-11-03 08:15:10 -07:00
LICENSE	cargo: add LICENSE file to each crate we publish	2023-09-22 21:48:28 -07:00