The text 915ef9a7e1ae, as Debian 10 (Buster) shipped it.
resolve merge conflicts
git-annex-resolvemerge(1) on Linux now
