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/52d842b8df4a1199f0a99c19750960860f7b958e/demos/juggle_conflicts.png)