Martin von Zweigbergk 7f334656b1 tree: return early when trying to resolve modify/delete conflict ... Modify/delete conflicts cannot be automatically resolved, so there's no point in wasting resources calculating the diff(s).		2023-02-17 22:05:44 -08:00
..
gen-protos
src	tree: return early when trying to resolve modify/delete conflict	2023-02-17 22:05:44 -08:00
tests	repo: replace RepoRef by Repo trait	2023-02-15 19:15:17 -08:00
testutils	release: release version 0.7.0	2023-02-16 12:50:52 -08:00
build.rs
Cargo.toml	release: release version 0.7.0	2023-02-16 12:50:52 -08:00