mirror of
https://github.com/martinvonz/jj.git
synced 2025-01-26 06:01:48 +00:00
78dfec9701
Conflicted branches are no longer error, and we use the state stored in the view. |
||
---|---|---|
.. | ||
benches | ||
gen-protos | ||
src | ||
tests | ||
testutils | ||
Cargo.toml |