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.
71 KiB
720x1658px
71 KiB
720x1658px
![](/mirrors/jj/raw/commit/a9d4886997a7ec00654ab0aac69cc484bb1180ef/demos/resolve_conflicts.png)