mirror of
https://github.com/martinvonz/jj.git
synced 2025-02-08 05:30:25 +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/5895df7d02ae8849b2e450def08b2553822cf0c8/demos/resolve_conflicts.png)