Martin von Zweigbergk b8f6a48c66 merge: fast-path trivial merge of 1-way "conflicts" ... I don't think we call `trivial_merge()` for 1-way "conflicts" yet, but I'll probably end up doing that soon.		2023-06-26 13:47:33 +02:00
..
benches	benches: group unchanged/modified/reversed-line diffs together	2023-03-27 23:38:56 +09:00
gen-protos	backend: split up store.proto in git and local versions	2023-06-22 13:49:46 +02:00
src	merge: fast-path trivial merge of 1-way "conflicts"	2023-06-26 13:47:33 +02:00
tests	Fix jj init --git-repo fails and leaves broken .jj folder	2023-06-20 11:02:06 -07:00
testutils	cargo: bump itertools from 0.10.5 to 0.11.0	2023-06-22 18:18:48 +02:00
build.rs	lib: replace protobuf crate with prost	2022-12-22 07:04:35 -08:00
Cargo.toml	cargo: bump itertools from 0.10.5 to 0.11.0	2023-06-22 18:18:48 +02:00