git-merge.txt: modernize word choice in "True merge" section