merge-strategies.txt: fix typo
Signed-off-by: Felipe Gonçalves Assis <felipegassis@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Felipe Gonçalves Assis committed
Feb 21, 2016 at 19:59 UTC
83837ec0b43bfd832ea00cd96e8b47c90991c473
1 file changed
+2
-2
Documentation/merge-strategies.txt
+2
-2
@@ -86,8 +86,8 @@ no-renames;;
86
See also linkgit:git-diff[1] `--no-renames`.
87
88
find-renames[=<n>];;
89
- Turn on rename detection, optionally setting the the similarity
90
- threshold. This is the default.
89
+ Turn on rename detection, optionally setting the similarity
90
+ threshold. This is the default.
91
See also linkgit:git-diff[1] `--find-renames`.
92
93
rename-threshold=<n>;;