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>
git-mirror · Mar 27, 2013 · 38ef8a7 · 38ef8a7
1 parent e39c695
commit 38ef8a7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
@@ -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'.