forked from mirrors/jj
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
![](/ok/jj/raw/commit/4f36367aee5d5bf635c04ba619e530745f77a439/demos/resolve_conflicts.png)