mirror of
https://github.com/martinvonz/jj.git
synced 2025-02-06 03:22:59 +00:00
The replacement is not purely mechanical, some text is also adjusted to talk about bookmarks.
61 KiB
720x1496px
61 KiB
720x1496px
![](/mirrors/jj/raw/commit/ded48ff6e7bf71263d2730a4d12f3568e3d555ca/demos/juggle_conflicts.png)