mirror of
https://github.com/martinvonz/jj.git
synced 2025-01-30 16:10:23 +00:00
ac9fb1832d
This adds `MutableRepo::merge()`, which applies the difference between two `ReadonRepo`s to itself. That results in much simpler code than the current code in `merge_op_heads()`. It also lets us write `undo` using the new function. Finally -- and this is the actual reason I did it now -- it prepares for using the index when enforcing view invariants. |
||
---|---|---|
.. | ||
protos | ||
src | ||
tests | ||
build.rs | ||
Cargo.toml |