Documentation: fix and clarify grammar in git-merge docs.