Grammar fix for "git merge" man page

As spotted by the eagle eyes of Jeff King.

Signed-off-by: Wincent Colaiuta <win@wincent.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 427ad9083ef4f605728565634ead2b9cc207cb09..c04ae739edd409307d286fe31e6f87e41f977eac 100644 (file)
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -40,7 +40,7 @@ include::merge-options.txt[]
 include::merge-strategies.txt[]
 
 
-If you tried a merge which resulted in a complex conflicts and
+If you tried a merge which resulted in complex conflicts and
 want to start over, you can recover with 'git-reset'.
 
 CONFIGURATION