forked from mirrors/jj
I had to modify the operation log a bit to fit on my scren with #1221 fixed. Closes #1221.
248 KiB
815x1178px
248 KiB
815x1178px
![](/ok/jj/raw/commit/e7bd7a635ad9b03f0be82cd22ea1dd2f723f0168/demos/juggle_conflicts.png)