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/6e06a79cfde01077ed1a795da95d448a96e15ed5/demos/resolve_conflicts.png)