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	commands: move files code to files.rs	2023-10-28 19:02:54 +02:00
testing	fake_diff_editor: Allow specifying extra arguments to be ignored	2023-08-21 20:19:15 -07:00
tests	templater: add local/remote_branches keywords	2023-10-28 11:03:23 +09:00
build.rs
Cargo.toml	cli: use StringPattern to find branches to delete/forget	2023-10-22 04:07:49 +09:00
LICENSE	cargo: add LICENSE file to each crate we publish	2023-09-22 21:48:28 -07:00