Merge branch 'kb/full-history-compute-treesame-carefully-2'

diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index c97574323099bd5b831f2b1c12a54b8c5e06373b..24ab07a3f8f80c56cbbd7feffc1b5bf65e137968 100644 (file)
--- 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'.