From 83837ec0b43bfd832ea00cd96e8b47c90991c473 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felipe=20Gon=C3=A7alves=20Assis?= Date: Sun, 21 Feb 2016 19:59:01 -0300 Subject: [PATCH] merge-strategies.txt: fix typo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Felipe Gonçalves Assis Signed-off-by: Junio C Hamano --- 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 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[=];; - 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=;;