aboutsummaryrefslogtreecommitdiffstats
path: root/using-git.texinfo
diff options
context:
space:
mode:
authorMattias Andrée <maandree@operamail.com>2013-10-25 04:22:10 +0200
committerMattias Andrée <maandree@operamail.com>2013-10-25 04:22:10 +0200
commitc7dc451bbba3a0e014af3f4d957846a24dd79848 (patch)
treeccec8634cfddddef8ac9f6d3e7c19a270833d534 /using-git.texinfo
parenttypo (diff)
downloadusing-git-c7dc451bbba3a0e014af3f4d957846a24dd79848.tar.gz
using-git-c7dc451bbba3a0e014af3f4d957846a24dd79848.tar.bz2
using-git-c7dc451bbba3a0e014af3f4d957846a24dd79848.tar.xz
m
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Diffstat (limited to '')
-rw-r--r--using-git.texinfo4
1 files changed, 2 insertions, 2 deletions
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,