Improve language in git-merge.txt and related docs