mirror of
https://github.com/martinvonz/jj.git
synced 2025-02-07 21:27:06 +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/4cdead34b497b9c3edb6773dbd7cc8f7176640a5/demos/juggle_conflicts.png)