mirror of
https://github.com/martinvonz/jj.git
synced 2025-02-07 04:51:45 +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/863a6e6d09ff902157ce2d3b2a93feda6813e83b/demos/resolve_conflicts.png)