From c7dc451bbba3a0e014af3f4d957846a24dd79848 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Fri, 25 Oct 2013 04:22:10 +0200 Subject: m MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- using-git.texinfo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'using-git.texinfo') diff --git a/using-git.texinfo b/using-git.texinfo index 7440929..026b4a9 100644 --- a/using-git.texinfo +++ b/using-git.texinfo @@ -631,8 +631,8 @@ git fetch MERGEE && git merge MERGEE @end example -If you two cannot be automatically merged, -you will get a merge conflict. A case +If the two branches cannot be automatically +merged, you will get a merge conflict. A case where you will get merge conflicts is when one of the branches has made a modification where the other has change the indention, -- cgit v1.2.3-70-g09d2