mirror of
https://github.com/martinvonz/jj.git
synced 2025-02-07 21:27: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/7906b3f4a5abbeb36b1904ba6365b1f53cad3224/demos/resolve_conflicts.png)