From: Felipe Gonçalves Assis <felipeg.assis@gmail.com>
Date: Sun, 21 Feb 2016 22:59:01 +0000 (-0300)
Subject: merge-strategies.txt: fix typo
X-Git-Tag: v2.8.0-rc0~8^2~4
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=83837ec0b43bfd832ea00cd96e8b47c90991c473;p=git-core%2Fgit.git

merge-strategies.txt: fix typo

Signed-off-by: Felipe Gonçalves Assis <felipegassis@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt
index ff359b6ca..2eb92b932 100644
--- 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>;;