Ilya Grigoriev 85b472b507 Expose functions useful for conflict resolution UI ... This refactors `conflicts.rs` to: 1. Make `describe_conflict` public 2. Extract the functionality to create text version of a conflict as the `materialize_merge_result` function. 3. Extract the functionality to turn a conflicted file into the complete contents of each version of the file "added" or removed" (when possible). This becomes the `extract_file_conflict_data` function. This is useful in order to present these text versions in a merge tool.		2022-12-03 15:12:40 -08:00
..
src	Expose functions useful for conflict resolution UI	2022-12-03 15:12:40 -08:00
tests	git: on export, use repo view's git_refs as record of old export state	2022-12-03 09:32:49 -08:00
testutils	copyright: change from "Google LLC" to "The Jujutsu Authors"	2022-11-28 06:05:45 -10:00
build.rs	copyright: change from "Google LLC" to "The Jujutsu Authors"	2022-11-28 06:05:45 -10:00
Cargo.toml	cargo: bump insta from 1.21.1 to 1.21.2	2022-11-28 05:29:03 -10:00