Hi,
I’ve been looking at Pijul from afar. One point that isn’t clear for me is how to find files with conflicts.
If I understand correctly, it add “<<<” and “===” lines. A grep can do it but there was a PR for a status command (Request for comments: Listing files with conflicts in `pijul status` - #10 by laumann). I could not find it in the doc nor in the issues. pijul diff does not seem to offer this functionality. The code in lib/src/output.rs seem to refer to conflict but I’m not sure what it does 
Thanks