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/393f3acb038c5f27c8173e62561cbecc19147c29/demos/juggle_conflicts.png)