merge-strategies.txt: fix typo

Signed-off-by: Felipe Gonçalves Assis <felipegassis@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
9 years ago · 83837ec0b4
1 changed files with 2 additions and 2 deletions
--- a/Documentation/merge-strategies.txt
+++ b/Documentation/merge-strategies.txt
@ -86,8 +86,8 @@ no-renames;;
				@@ -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>;;