Yuya Nishihara a6566832c2 merged_tree: extract file-conflict resolution from merge_tree_values() ... I'll add a public function that resolves file conflicts. This function will take owned MergedTreeValue, and that's why the extracted function returns None instead of cloning the passed value.		2024-08-13 15:02:24 +09:00
..
benches
gen-protos
proc-macros	cargo: explicitly indicate paths to publish	2024-04-15 20:37:00 -07:00
src	merged_tree: extract file-conflict resolution from merge_tree_values()	2024-08-13 15:02:24 +09:00
tests	merged_tree: replace MergedTreeVal<'_> by Merge<Option<&TreeValue>>	2024-08-12 23:01:46 +09:00
testutils	copy-tracking: create CopyRecordMap and add it to diff summaries	2024-08-11 17:01:45 -04:00
Cargo.toml	jj_lib: include indexmap as dependency	2024-08-12 21:48:17 +08:00
LICENSE	cargo: add LICENSE file to each crate we publish	2023-09-22 21:48:28 -07:00