Martin von Zweigbergk cfcdd71865 backend: make read_conflict synchronous again ... This avoids https://github.com/rust-lang/futures-rs/issues/2090. I don't think we need to worry about reading legacy conflicts asynchronously - async is really only useful for Google's backend right now, and we don't use the legacy format at Google. In particular, I don't want `MergedTree::value()` to have to be async.		2023-10-28 16:45:40 -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	backend: make read_conflict synchronous again	2023-10-28 16:45:40 -07:00
tests	merged_tree: propagate backend errors in diff iterator	2023-10-26 06:20:56 -07:00
testutils	backend: make read_conflict synchronous again	2023-10-28 16:45:40 -07:00
Cargo.toml	revset: add support for glob:pattern	2023-10-21 09:55:01 +09:00
LICENSE	cargo: add LICENSE file to each crate we publish	2023-09-22 21:48:28 -07:00