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