Martin von Zweigbergk 23509e939e working_copy: get diff from MergedTrees ... To support tree-level conflicts, we're going to need to update the working copy from one `MergedTree` to another. We're going need to store multiple tree ids in the `tree_state` file. This patch gets us closer to that by getting the diff from `MergedTree`s`, even though we assume that they are legacy trees for now, so we can write to the single-tree `tree_state` file.		2023-08-25 06:40:36 -07:00
..
examples
src	working_copy: get diff from MergedTrees	2023-08-25 06:40:36 -07:00
testing	fake_diff_editor: Allow specifying extra arguments to be ignored	2023-08-21 20:19:15 -07:00
tests	templates: colorize description_placeholder	2023-08-25 10:03:30 +05:30
build.rs
Cargo.toml	Use { workspace = true } to appease VS Code's Cargo.toml parser	2023-08-22 21:38:53 -07:00