Martin von Zweigbergk 8764ad9826 conflicts: make materialization async ... We need to let async-ness propagate up from the backend because `block_on()` doesn't like to be called recursively. The conflict materialization code is a good place to make async because it doesn't depends on anything that isn't already async-ready.		2023-10-20 07:38:34 -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	Use { workspace = true } to appease VS Code's Cargo.toml parser	2023-08-22 21:38:53 -07:00
src	conflicts: make materialization async	2023-10-20 07:38:34 -07:00
tests	conflicts: make materialization async	2023-10-20 07:38:34 -07:00
testutils	working copy: pass commit instead of tree into check_out()	2023-10-16 22:33:44 -07:00
Cargo.toml	backend: make read functions async	2023-10-08 23:36:49 -07:00
LICENSE	cargo: add LICENSE file to each crate we publish	2023-09-22 21:48:28 -07:00