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