Yuya Nishihara 35f718f212 merged_tree: remove canceling terms prior to resolving file-level conflict ... I think this is a variant of the problem fixed by 7fda80fc22 "tree: simplify conflict before resolving at hunk level." We need to simplify() the conflict before and after extracting file ids because the source conflict values may contain trees to be cancelled out, and the file values may differ only in exec bits. Since the legacy tree passes a simplified conflict in to this function, I made the merged tree do the same. Fixes #2654		2023-12-03 07:44:58 +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	merged_tree: remove canceling terms prior to resolving file-level conflict	2023-12-03 07:44:58 +09:00
tests	merged_tree: remove canceling terms prior to resolving file-level conflict	2023-12-03 07:44:58 +09:00
testutils	signing: pass SigningFn by reference	2023-12-01 22:55:04 +09:00
Cargo.toml	cargo: add ref-cast dependency	2023-11-26 18:21:40 +09:00
LICENSE	cargo: add LICENSE file to each crate we publish	2023-09-22 21:48:28 -07:00