mirror of
https://github.com/martinvonz/jj.git
synced 2024-09-11 13:56:29 +03:00
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
![](/martinvonz/jj/raw/commit/cb86efac617b109d1e7805c2cf29bb121226ade3/demos/juggle_conflicts.png)