mirror of
https://github.com/martinvonz/jj.git
synced 2025-02-06 20:42:10 +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/36b7f007eb334b7268b7f1d03e1d15cabcf1074a/demos/juggle_conflicts.png)