ok/jj
1
0
Fork 0
forked from mirrors/jj
jj/lib
Martin von Zweigbergk 92f9fe5a1b tree: make conflict_term_to_conflict() take a TreeValue
The function only needs the `TreeValue` so it makes more sense this
way, I think. That will also let the caller keep the rest of the
`Conflict` value owned (though there is nothing but the `value` field
in it right now).
2023-02-18 00:09:51 -08:00
..
gen-protos cargo: bump prost-build from 0.11.5 to 0.11.6 2023-01-13 21:24:02 +00:00
src tree: make conflict_term_to_conflict() take a TreeValue 2023-02-18 00:09:51 -08:00
tests backend: rename ConflictPart to ConflictTerm 2023-02-17 23:28:50 -08:00
testutils release: release version 0.7.0 2023-02-16 12:50:52 -08:00
build.rs lib: replace protobuf crate with prost 2022-12-22 07:04:35 -08:00
Cargo.toml release: release version 0.7.0 2023-02-16 12:50:52 -08:00