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
..
custom-backend	backend: make read_conflict synchronous again	2023-10-28 16:45:40 -07:00
custom-command	cli: send status messages to stderr, specify stdout/stderr explicitly	2023-10-11 19:24:01 +09:00
custom-global-flag	cli: send status messages to stderr, specify stdout/stderr explicitly	2023-10-11 19:24:01 +09:00
custom-working-copy	workspace: make working-copy type customizable	2023-10-16 22:33:44 -07:00