mirror of
https://github.com/martinvonz/jj.git
synced 2025-01-02 18:01:05 +00:00
d886d8c203
We already have the new `Conflict::from_backend_conflict()` for converting from a `backend::Conflict`, but we model conflicts in a similar way in at least `RefTarget`. I'd like to be able to use `conflicts::Conflict` there too. To prepare for that, let's extract generic methods from `Conflict::from_backend_conflict()` and `Conflict::to_backend_conflict()`. I'm not sure I'll get around to making `RefTarget` use `Conflict` but this commit seems like nice cleanup either way. It makes the tests simpler if nothing else. |
||
---|---|---|
.. | ||
benches | ||
gen-protos | ||
src | ||
tests | ||
testutils | ||
build.rs | ||
Cargo.toml |