jj/cli
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
..
examples backend: make read_conflict synchronous again 2023-10-28 16:45:40 -07:00
src
testing
tests
build.rs
Cargo.toml
LICENSE