summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
diff options
context:
space:
mode:
authorFelipe Gonçalves Assis <felipeg.assis@gmail.com>2016-02-21 22:59:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-02-22 18:42:52 (GMT)
commit83837ec0b43bfd832ea00cd96e8b47c90991c473 (patch)
tree94467dae4ff0595e1829f5465b4f8aaeb0486685 /Documentation/merge-strategies.txt
parent1b47ad160b55f50a7a98c180e18d80f0f8f17a67 (diff)
downloadgit-83837ec0b43bfd832ea00cd96e8b47c90991c473.zip
git-83837ec0b43bfd832ea00cd96e8b47c90991c473.tar.gz
git-83837ec0b43bfd832ea00cd96e8b47c90991c473.tar.bz2
merge-strategies.txt: fix typo
Signed-off-by: Felipe Gonçalves Assis <felipegassis@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-strategies.txt')
-rw-r--r--Documentation/merge-strategies.txt4
1 files 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[=<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>;;