Martin von Zweigbergk f1e2124a64 trees: make simplify_conflict() always return a Conflict ... The interface is much cleaner this way. The function no longer makes any writes to the store.		2021-10-20 22:07:42 -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	trees: make simplify_conflict() always return a Conflict	2021-10-20 22:07:42 -07:00
tests	git: don't update public heads for now	2021-10-20 14:23:58 -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