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

..

mod.rs

lib: replace protobuf crate with prost

2022-12-22 07:04:35 -08:00

op_store.proto

git: allow conflicts in "HEAD@git"

2023-01-30 09:05:03 -08:00

op_store.rs

git: allow conflicts in "HEAD@git"

2023-01-30 09:05:03 -08:00

store.proto

backend: rename ConflictPart to ConflictTerm

2023-02-17 23:28:50 -08:00

store.rs

backend: rename ConflictPart to ConflictTerm

2023-02-17 23:28:50 -08:00

working_copy.proto

working_copy: get conflict id from the current tree

2023-05-31 06:28:15 -07:00

working_copy.rs

working_copy: get conflict id from the current tree

2023-05-31 06:28:15 -07:00