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

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 ---

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

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;; >