Martin von Zweigbergk c93e806265 conflicts: make materialized tree/file conflicts etc a little more useful ... When there are conflicts between different types of tree entries, we currently materialize them as "Unresolved complex conflict.". This change makes it so we mention what types were involved and what their ids were (though we still don't have an easy way of resolving an id).		2021-06-29 10:49:15 -07:00
..
benches	project: rename project from Jujube to Jujutsu	2021-05-15 10:28:40 -07:00
protos
src	conflicts: make materialized tree/file conflicts etc a little more useful	2021-06-29 10:49:15 -07:00
tests	cleanup: let Clippy fix a bunch of warnings	2021-06-14 00:27:31 -07:00
build.rs
Cargo.toml	cargo: update test-case to 1.2.0 now that frondeus/test-case#66 is fixed	2021-06-28 12:13:14 -07:00