The text 8c1d24c3a09d, as Debian 11 (Bullseye) shipped it.
resolve merge conflicts
git-annex-resolvemerge(1) on Linux now
