mirror of
https://github.com/martinvonz/jj.git
synced 2025-02-11 06:42:47 +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/602b79f7fdf2a25fc06b9a899b14eae3205c88b0/demos/juggle_conflicts.png)