mirror of
https://github.com/martinvonz/jj.git
synced 2024-10-27 00:51:35 +00:00
21b11df8a9
Resolves states are most common and the current format is pretty verbose. Let's print it as if `Merge` were an enum with `Resolved` and `Conflicted` variants instead. |
||
---|---|---|
.. | ||
benches | ||
gen-protos | ||
src | ||
tests | ||
testutils | ||
Cargo.toml | ||
LICENSE |