Martin von Zweigbergk 9abee0096f conflicts: propagate errors from materialize_conflict() ... All current callers pass in a buffer, so it should never fail, but the function itself can't know that.		2021-10-24 23:02:00 -07:00
..
benches	project: rename project from Jujube to Jujutsu	2021-05-15 10:28:40 -07:00
protos	backend: remove unused Commit::is_pruned (#32)	2021-10-06 23:53:15 -07:00
src	conflicts: propagate errors from materialize_conflict()	2021-10-24 23:02:00 -07:00
tests	conflicts: propagate errors from materialize_conflict()	2021-10-24 23:02:00 -07:00
build.rs	rustfmt: configure to group imports	2021-03-14 10:46:25 -07:00
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