print all conflicts in the current channel

rework test.sh to demo.sh

The test.sh script was more intended to be a kind of demo, and instead of creating lots of little repos, I prefer it to create just one repo and produce all the conflicts there.

Created by  laumann  on June 22, 2023
OY22R4GF23ULRECE2XCL2CFA7CKARS5SACRGLRT3AHHQ5ODHQ5XAC
Change contents