Martin von Zweigbergk 2ccb17b7b3 cli: enable tree-level conflicts by default ... I have used the tree-level conflict format for several weeks without problem (after the fix in 51b5d168ae). Now - right after the 0.10.0 release - seems like a good time to enable the config by default. I enabled the config in our default configs in the CLI crate to reduce impact on tests (compared to changing the default in `settings.rs`).		2023-10-05 10:31:47 -07:00
..
examples
src	cli: enable tree-level conflicts by default	2023-10-05 10:31:47 -07:00
testing
tests	cli: enable tree-level conflicts by default	2023-10-05 10:31:47 -07:00
build.rs
Cargo.toml	cargo: make jj installable with cargo binstall	2023-09-20 09:35:18 -07:00
LICENSE	cargo: add LICENSE file to each crate we publish	2023-09-22 21:48:28 -07:00