mirror of
https://github.com/martinvonz/jj.git
synced 2025-02-12 07:24:11 +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/f87c6ed337bf6b274238671d38eaa0fa23f3ac93/demos/resolve_conflicts.png)