From 9d65c44674d527c0879fbc7983b7c6a0a4564660 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Fri, 25 Oct 2013 04:23:23 +0200 Subject: grammaro 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(-) diff --git a/using-git.texinfo b/using-git.texinfo index 026b4a9..5fc6588 100644 --- a/using-git.texinfo +++ b/using-git.texinfo @@ -637,7 +637,7 @@ where you will get merge conflicts is when 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. +or both have edited the same lines. If you get a merge conflict, Git will tell you so, in which files there are conflicts, -- cgit v1.2.3-70-g09d2