mirror of
https://github.com/martinvonz/jj.git
synced 2025-01-28 23:32:41 +00:00
0b27c33a13
We were using `current_tree()` only for an assertion where we were walking its entries. Now that `MergedTree` supports that, we can replace `current_tree()` by `current_merged_tree()`. There's more work needed before the working copy can fully work with tree-level conflicts. We still need to be able to store multiple tree ids in the `tree_state` file, and we need to be able to create multiple trees instead of writing conflict objects to the backend. |
||
---|---|---|
.. | ||
benches | ||
gen-protos | ||
src | ||
tests | ||
testutils | ||
Cargo.toml |