Documentation/git-merge: reword references to "remote" and "pull"