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