Fix incorrect wording in git-merge.txt.