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>
Wincent Colaiuta committed
Mar 26, 2009 at 10:39 UTC
9fe00538c693929d4dec29690fe7660106fe056a
1 file changed
+1
-1
Documentation/git-merge.txt
+1
-1
@@ -40,7 +40,7 @@ include::merge-options.txt[]
40
include::merge-strategies.txt[]
41
42
43
-If you tried a merge which resulted in a complex conflicts and
43
+If you tried a merge which resulted in complex conflicts and
44
want to start over, you can recover with 'git-reset'.
45
46
CONFIGURATION