mirror of
https://github.com/martinvonz/jj.git
synced 2025-02-11 23:08:03 +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/a45eb0b0d58f2f8c9d94fb090324e6c68f0f1eeb/demos/juggle_conflicts.png)