mirror of
https://github.com/martinvonz/jj.git
synced 2025-05-07 08:22:50 +00:00
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]