Martin von Zweigbergk 97b81a0f12 working_copy: get conflict id from the current tree ... This prepares for allowing the base tree to be a conflict at the root-tree level (#1624). We could remove the `Conflict` variant completely. I tried doing that and it slowed down `jj diff` by ~3% in the Linux repo with a clean working copy with only mtime bumped on all files.		2023-05-31 06:28:15 -07:00
..
benches	benches: group unchanged/modified/reversed-line diffs together	2023-03-27 23:38:56 +09:00
gen-protos	cargo: bump prost-build from 0.11.8 to 0.11.9	2023-04-14 16:11:09 +00:00
src	working_copy: get conflict id from the current tree	2023-05-31 06:28:15 -07:00
tests	index: pass only CompositeIndex to default_revset_engine::evaluate()	2023-05-29 08:15:40 +09:00
testutils	cargo: bump git2 from 0.17.1 to 0.17.2	2023-05-29 20:25:04 +02:00
build.rs	lib: replace protobuf crate with prost	2022-12-22 07:04:35 -08:00
Cargo.toml	cargo: bump once_cell from 1.17.1 to 1.17.2	2023-05-29 20:26:10 +02:00