mirror of
https://github.com/martinvonz/jj.git
synced 2025-02-06 03:22:59 +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/891fe085a60590ffc95d01610e9a3b256af4dcf9/demos/resolve_conflicts.png)