X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=Documentation%2Fgit-merge.txt;h=c04ae739edd409307d286fe31e6f87e41f977eac;hb=7d40f89137b456820d51ebc1cbb3ffbb966e7fec;hp=427ad9083ef4f605728565634ead2b9cc207cb09;hpb=23fd723c9dfbe9b558c0d9a46696ca93f93bab04;p=git.git

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