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

Cargo.nix, and solving conflicts

Created by  pmeunier  on November 26, 2020
H62VFFJEBL2I3O4D3BAJZ57ROPWUISC7JCDIWFBC5DAYJRHMMDXAC
Change contents