mirror of
https://github.com/martinvonz/jj.git
synced 2025-01-15 16:53:25 +00:00
11b9888cdf
This helps resolve diverged refs by abandoning both sides: D ref = [D] |\ | C C ref = [B - D + C] | | | B | B | B ref = [B - D + A] |/ |/ | A A A A ref = [A - D + A] |
||
---|---|---|
.. | ||
benches | ||
gen-protos | ||
proc-macros | ||
src | ||
tests | ||
testutils | ||
Cargo.toml | ||
LICENSE |