From: Mihai Capotă <mihai@mihaic.ro>
Date: Wed, 27 Mar 2013 11:04:51 +0000 (+0100)
Subject: git-pull doc: fix grammo ("conflicts" is plural)
X-Git-Tag: v1.8.1.6~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=38ef8a76e7c8c3e1be6e6ae96cfccc4191e9eac8;p=git

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>
---

diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 67fa5ee195..638456b68c 100644
--- 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'.