mirror of
https://github.com/martinvonz/jj.git
synced 2025-02-06 03:22:59 +00:00
23509e939e
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. |
||
---|---|---|
.. | ||
bench.rs | ||
branch.rs | ||
debug.rs | ||
git.rs | ||
mod.rs | ||
operation.rs |