From: Wincent Colaiuta <win@wincent.com>
Date: Thu, 26 Mar 2009 09:39:04 +0000 (+0100)
Subject: Grammar fix for "git merge" man page
X-Git-Tag: v1.6.3-rc0~77
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9fe00538c693929d4dec29690fe7660106fe056a;p=git.git

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 427ad9083..c04ae739e 100644
--- 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