[PATCH 2/5] merge-strategies.txt: fix typo

[Felipe Gonçalves Assis]

Signed-off-by: Felipe Gonçalves Assis 
---
 Documentation/merge-strategies.txt | 4 ++--
 1 file 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[=];;
-   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=;;
-- 
2.7.1.492.gc9722f8

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 2/5] merge-strategies.txt: fix typo

[Eric Sunshine]

On Sun, Feb 21, 2016 at 10:09 AM, Felipe Gonçalves Assis
 wrote:
> Signed-off-by: Felipe Gonçalves Assis 
> ---
> diff --git a/Documentation/merge-strategies.txt 
> b/Documentation/merge-strategies.txt
> @@ -86,8 +86,8 @@ no-renames;;
>  find-renames[=];;
> -   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.

I'd probably have omitted the unimportant whitespace change on the
second line from the patch since it's just noise which distracts from
the real fix, but this alone is not worth a re-roll.

> See also linkgit:git-diff[1] `--find-renames`.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html