Martin von Zweigbergk 21b11df8a9 merge: make non-conflicted debug string for Merge shorter ... 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.		2023-10-24 06:45:45 -07:00
..
benches
gen-protos	Use { workspace = true } to appease VS Code's Cargo.toml parser	2023-08-22 21:38:53 -07:00
src	merge: make non-conflicted debug string for Merge shorter	2023-10-24 06:45:45 -07:00
tests	merge: make non-conflicted debug string for Merge shorter	2023-10-24 06:45:45 -07:00
testutils	working copy: pass commit instead of tree into check_out()	2023-10-16 22:33:44 -07:00
Cargo.toml	revset: add support for glob:pattern	2023-10-21 09:55:01 +09:00
LICENSE	cargo: add LICENSE file to each crate we publish	2023-09-22 21:48:28 -07:00