forked from mirrors/jj
92f9fe5a1b
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). |
||
---|---|---|
.. | ||
gen-protos | ||
src | ||
tests | ||
testutils | ||
build.rs | ||
Cargo.toml |