mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-16 09:11:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7
jj/lib
History
Martin von Zweigbergk 873a6f0674 merged_tree: add a function for merging 3 MergedTrees 
With the already existing `MergedTree::resolve()` and all the recent
refactorings into `Merge<T>`, it's now very easy to add support for
3-way merging of `MergedTree` instances.
2023-08-28 15:58:34 -07:00
..
benches cargo: rename crates from jujutsu/jujutsu-lib to jj-cli/jj-lib 2023-07-09 06:40:43 +02:00
gen-protos Use { workspace = true } to appease VS Code's Cargo.toml parser 2023-08-22 21:38:53 -07:00
src merged_tree: add a function for merging 3 MergedTrees 2023-08-28 15:58:34 -07:00
tests merged_tree: add a function for merging 3 MergedTrees 2023-08-28 15:58:34 -07:00
testutils commit_builder: take MergedTreeId for root id argument 2023-08-28 15:58:34 -07:00
Cargo.toml merged_tree: add diff iterator 2023-08-25 06:40:36 -07:00