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