Merge branch 'ls/travis-enable-httpd-tests'

diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt
index ff359b6ca23e4038fbe5b10bdf3aaf274f403264..2eb92b93274df9fb5002336114654fe869903808 100644 (file)
--- a/Documentation/merge-strategies.txt
+++ b/Documentation/merge-strategies.txt
@@ -86,8 +86,8 @@ no-renames;;
        See also linkgit:git-diff[1] `--no-renames`.
 
 find-renames[=<n>];;
-       Turn on rename detection, optionally setting the the similarity
-       threshold. This is the default.
+       Turn on rename detection, optionally setting the similarity
+       threshold.  This is the default.
        See also linkgit:git-diff[1] `--find-renames`.
 
 rename-threshold=<n>;;