Browse Source

merge-strategies.txt: fix typo

Signed-off-by: Felipe Gonçalves Assis <felipegassis@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Felipe Gonçalves Assis 9 years ago committed by Junio C Hamano
parent
commit
83837ec0b4
  1. 4
      Documentation/merge-strategies.txt

4
Documentation/merge-strategies.txt

@ -86,8 +86,8 @@ no-renames;;
See also linkgit:git-diff[1] `--no-renames`. See also linkgit:git-diff[1] `--no-renames`.


find-renames[=<n>];; find-renames[=<n>];;
Turn on rename detection, optionally setting the the similarity Turn on rename detection, optionally setting the similarity
threshold. This is the default. threshold. This is the default.
See also linkgit:git-diff[1] `--find-renames`. See also linkgit:git-diff[1] `--find-renames`.


rename-threshold=<n>;; rename-threshold=<n>;;

Loading…
Cancel
Save