forked from mirrors/jj
6ab9d7bdc7
The current implementation of `resolve()` on legacy trees just pretended any conflicts were regular files. It's better to error out. The function is only used in tests so far. |
||
---|---|---|
.. | ||
benches | ||
gen-protos | ||
proc-macros | ||
src | ||
tests | ||
testutils | ||
Cargo.toml | ||
LICENSE |