chiark / gitweb /
Mention "git merge", not "git-merge", in helpful message. Closes:#725632.