forked from mirrors/jj
adf9679d4c
The function is just a few lines now. I don't think we need the long documentation in it either since that's now in docs/technical/conflicts.md. |
||
---|---|---|
.. | ||
benches | ||
gen-protos | ||
src | ||
tests | ||
testutils | ||
Cargo.toml |