mirror of
https://github.com/martinvonz/jj.git
synced 2025-02-07 04:51:45 +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/c9b6ba7b57121c026108270b1f1075fb3b8a4318/demos/juggle_conflicts.png)