forked from mirrors/jj
78dfec9701
Conflicted branches are no longer error, and we use the state stored in the view. |
||
---|---|---|
.. | ||
benches | ||
gen-protos | ||
src | ||
tests | ||
testutils | ||
Cargo.toml |
78dfec9701
Conflicted branches are no longer error, and we use the state stored in the view. |
||
---|---|---|
.. | ||
benches | ||
gen-protos | ||
src | ||
tests | ||
testutils | ||
Cargo.toml |