Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
merge-strategies.txt: fix typo
Signed-off-by: Felipe Gonçalves Assis <felipegassis@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Felipe Gonçalves Assis authored and Junio C Hamano committed Feb 22, 2016
1 parent 1b47ad1 commit 83837ec
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Documentation/merge-strategies.txt
Expand Up @@ -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>;;
Expand Down

0 comments on commit 83837ec

Please sign in to comment.