Yuya Nishihara f1898a31b5 merge: simply print interleaved conflict values in debug output ... We could apply that for the resolved case, but Resolved/Conflicted label seems more useful than just printing Merge([value]).		2023-11-06 07:21:06 +09:00
..
benches	cargo: rename crates from jujutsu/jujutsu-lib to jj-cli/jj-lib	2023-07-09 06:40:43 +02:00
gen-protos	Use { workspace = true } to appease VS Code's Cargo.toml parser	2023-08-22 21:38:53 -07:00
src	merge: simply print interleaved conflict values in debug output	2023-11-06 07:21:06 +09:00
tests	merge: simply print interleaved conflict values in debug output	2023-11-06 07:21:06 +09:00
testutils	tests: force gitoxide to not load config nor use "main" as default branch	2023-11-02 19:33:06 +09:00
Cargo.toml	async: switch to pollster's block_on()	2023-11-03 08:15:10 -07:00
LICENSE	cargo: add LICENSE file to each crate we publish	2023-09-22 21:48:28 -07:00