From 38ef8a76e7c8c3e1be6e6ae96cfccc4191e9eac8 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Mihai=20Capot=C4=83?= <mihai@mihaic.ro>
Date: Wed, 27 Mar 2013 12:04:51 +0100
Subject: [PATCH] git-pull doc: fix grammo ("conflicts" is plural)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mihai Capotă <mihai@mihaic.ro>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 Documentation/git-pull.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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'.
 
 
-- 
2.11.4.GIT