mirror of
https://github.com/martinvonz/jj.git
synced 2025-02-06 20:42:10 +00:00
The replacement is not purely mechanical, some text is also adjusted to talk about bookmarks.
71 KiB
720x1658px
71 KiB
720x1658px
![](/mirrors/jj/raw/commit/6fec00640587e55aa6891258edb1e8d7bd1958ad/demos/resolve_conflicts.png)