From 1fbe9b19cdd12bfc8aac243f5ca38e61aa20eb87 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Thu, 19 Sep 2013 17:31:01 +0200 Subject: typo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- using-git.texinfo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'using-git.texinfo') diff --git a/using-git.texinfo b/using-git.texinfo index b56b313..5224a70 100644 --- a/using-git.texinfo +++ b/using-git.texinfo @@ -545,7 +545,7 @@ git merge MERGEE @end example If you two cannot be automatically merged, -you will you get a merge conflict. A case +you will get a merge conflict. A case where you will get merge conflicts is when one of the branches as made a modification where the other has change the indention, -- cgit v1.2.3-70-g09d2