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
..
examples	workspace: make working-copy type customizable	2023-10-16 22:33:44 -07:00
src	conflicts: make materialization async	2023-10-20 07:38:34 -07:00
testing	fake_diff_editor: Allow specifying extra arguments to be ignored	2023-08-21 20:19:15 -07:00
tests	cli: do not list non-tracking remote branches by default	2023-10-19 05:23:38 +09:00
build.rs	build: update rerun-if conditions to watch .git/HEAD in colocated repo	2023-08-06 12:16:11 +09:00
Cargo.toml	conflicts: make materialization async	2023-10-20 07:38:34 -07:00
LICENSE	cargo: add LICENSE file to each crate we publish	2023-09-22 21:48:28 -07:00