Grammar fix for "git merge" man page