aboutsummaryrefslogtreecommitdiffstats
path: root/using-git.texinfo
diff options
context:
space:
mode:
authorMattias Andrée <maandree@operamail.com>2013-10-25 04:20:43 +0200
committerMattias Andrée <maandree@operamail.com>2013-10-25 04:20:43 +0200
commit2cbe646d67f19876ba517ef803f110664487ba5f (patch)
treee887092ec456d8588b7da3ed7112a3b348762764 /using-git.texinfo
parenttypo (diff)
downloadusing-git-2cbe646d67f19876ba517ef803f110664487ba5f.tar.gz
using-git-2cbe646d67f19876ba517ef803f110664487ba5f.tar.bz2
using-git-2cbe646d67f19876ba517ef803f110664487ba5f.tar.xz
typo
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Diffstat (limited to 'using-git.texinfo')
-rw-r--r--using-git.texinfo2
1 files changed, 1 insertions, 1 deletions
diff --git a/using-git.texinfo b/using-git.texinfo
index e192522..74c1501 100644
--- a/using-git.texinfo
+++ b/using-git.texinfo
@@ -615,7 +615,7 @@ git checkout BRANCH_NAME
@node Merging branches
@section Merging branches
-The merge a branch into another, switch
+To merge a branch into another, switch
to one of them and pull the other:
@example