git-pull doc: fix grammo ("conflicts" is plural)
git-pull doc: fix grammo ("conflicts" is plural)

Signed-off-by: Mihai Capotă <deda1b05bacf55e53e05d323db42d6d24e69f769@mihaic.ro>
Signed-off-by: Junio C Hamano <a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com>

destenson/git,destenson/git,destenson/git,destenson/git,destenson/git,destenson/git,destenson/git,destenson/git