mirror of
https://github.com/martinvonz/jj.git
synced 2025-02-06 11:34:54 +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/1b07df143ad6a68204bcd95ad84b771348a1a881/demos/resolve_conflicts.png)