aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattias Andrée <maandree@operamail.com>2013-09-19 17:31:48 +0200
committerMattias Andrée <maandree@operamail.com>2013-09-19 17:31:48 +0200
commitc76f68837047b86e63a9df80feeb2306e4c6df60 (patch)
treecf94be640aa37871c53cdff7a3226662c61ccac8
parenttypo (diff)
downloadusing-git-c76f68837047b86e63a9df80feeb2306e4c6df60.tar.gz
using-git-c76f68837047b86e63a9df80feeb2306e4c6df60.tar.bz2
using-git-c76f68837047b86e63a9df80feeb2306e4c6df60.tar.xz
typo
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 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.