From: Felipe Gonçalves Assis Date: Sun, 21 Feb 2016 22:59:01 GMT Subject: [PATCH v2 1/5] merge-strategies.txt: fix typo Message-ID: <1456095545-20201-2-git-send-email-felipegassis@gmail.com> In-Reply-To: <1456095545-20201-1-git-send-email-felipegassis@gmail.com> Signed-off-by: Felipe Gonçalves Assis --- Documentation/merge-strategies.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt index ff359b6..2eb92b9 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[=];; - 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=;; -- 2.7.1.492.gd821b20