From c76f68837047b86e63a9df80feeb2306e4c6df60 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Thu, 19 Sep 2013 17:31:48 +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 5224a70..6ba8409 100644 --- a/using-git.texinfo +++ b/using-git.texinfo @@ -547,7 +547,7 @@ git merge MERGEE If you two cannot be automatically merged, you will get a merge conflict. A case where you will get merge conflicts is when -one of the branches as made a modification +one of the branches has made a modification where the other has change the indention, so keep to a coding style from the start; or both has edited the same lines. -- cgit v1.2.3-70-g09d2