The text cf49bfa0be39, as Debian 9 (Stretch) shipped it.
resolve merge conflicts
git-annex-resolvemerge(1) on Linux now
