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

Signed-off-by: Mihai Capotă <mihai@mihaic.ro> Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years ago · 38ef8a76e7
1 changed files with 1 additions and 1 deletions
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@ -218,7 +218,7 @@ $ git merge origin/next
				@@ -218,7 +218,7 @@ $ git merge origin/next
 ------------------------------------------------


-If you tried a pull which resulted in a complex conflicts and
+If you tried a pull which resulted in complex conflicts and
 would want to start over, you can recover with 'git reset'.