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

Solving a conflict (this was a double conflict, actually)

Created by  pmeunier  on December 7, 2020
JSSEYW7NUUB5S2T6GPXOHECHZ5JY3KG3AT2IPSWCVIPUDHOBNZQAC
Change contents