Matches https://github.com/ilyagr/pijul-clone as of now, might become out of sync

Fixing a panic when showing conflict messages around conflict markers

Created by  pmeunier  on March 1, 2023
LXKZODXJKDAKPLZJN22UNPYSJ5VOFIVZVXRXTTZZ2LJTCBGITYWQC
Change contents