aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattias Andrée <maandree@operamail.com>2013-10-25 04:23:23 +0200
committerMattias Andrée <maandree@operamail.com>2013-10-25 04:23:23 +0200
commit9d65c44674d527c0879fbc7983b7c6a0a4564660 (patch)
tree84112048e12a0167efa99c706a1ad4b7d2e95704
parentm (diff)
downloadusing-git-9d65c44674d527c0879fbc7983b7c6a0a4564660.tar.gz
using-git-9d65c44674d527c0879fbc7983b7c6a0a4564660.tar.bz2
using-git-9d65c44674d527c0879fbc7983b7c6a0a4564660.tar.xz
grammaro
Signed-off-by: Mattias Andrée <maandree@operamail.com>
-rw-r--r--using-git.texinfo2
1 files changed, 1 insertions, 1 deletions
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,