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/9fc879747f547f5d6393ba90e2c8fa29b2849244/demos/juggle_conflicts.png)