Yuya Nishihara 424786def1 refs: leverage Conflict::flatten() and simplify() to premerge ref targets ... The order of conflicted ids slightly changed since Conflict::simplify() tries to preserve diff pairs. It shouldn't matter so long as the result is stable.		2023-07-12 21:29:41 +09:00
..
benches	cargo: rename crates from jujutsu/jujutsu-lib to jj-cli/jj-lib	2023-07-09 06:40:43 +02:00
gen-protos	backend: split up store.proto in git and local versions	2023-06-22 13:49:46 +02:00
src	refs: leverage Conflict::flatten() and simplify() to premerge ref targets	2023-07-12 21:29:41 +09:00
tests	refs: leverage Conflict::flatten() and simplify() to premerge ref targets	2023-07-12 21:29:41 +09:00
testutils	cargo: rename crates from jujutsu/jujutsu-lib to jj-cli/jj-lib	2023-07-09 06:40:43 +02:00
build.rs	lib: replace protobuf crate with prost	2022-12-22 07:04:35 -08:00
Cargo.toml	cargo: bump the cargo-dependencies group with 1 update	2023-07-11 19:24:06 +02:00