summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
diff options
context:
space:
mode:
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>;;