Martin von Zweigbergk adf9679d4c tree: inline simplify_conflict() ... The function is just a few lines now. I don't think we need the long documentation in it either since that's now in docs/technical/conflicts.md.		2023-08-11 21:11:25 +00:00
..
benches	cargo: rename crates from jujutsu/jujutsu-lib to jj-cli/jj-lib	2023-07-09 06:40:43 +02:00
gen-protos	cargo: unify a lot of crate metadata in the workspace	2023-08-06 16:44:33 -05:00
src	tree: inline simplify_conflict()	2023-08-11 21:11:25 +00:00
tests	merge: move some methods back to conflicts as free functions	2023-08-11 21:11:25 +00:00
testutils	tests: move commit_transactions() helper to testutils	2023-08-10 06:27:16 +09:00
Cargo.toml	cargo: unify a lot of crate metadata in the workspace	2023-08-06 16:44:33 -05:00