mirror of
https://github.com/martinvonz/jj.git
synced 2025-02-06 11:34:54 +00:00
I had to modify the operation log a bit to fit on my scren with #1221 fixed. Closes #1221.
261 KiB
815x1304px
261 KiB
815x1304px
![](/mirrors/jj/raw/commit/9fc879747f547f5d6393ba90e2c8fa29b2849244/demos/resolve_conflicts.png)