aboutsummaryrefslogtreecommitdiffstats
path: root/using-git.texinfo
diff options
context:
space:
mode:
authorMattias Andrée <maandree@operamail.com>2013-08-16 02:11:43 +0200
committerMattias Andrée <maandree@operamail.com>2013-08-16 02:11:43 +0200
commit264e1604e157a84368294bf539655ca4f254ecc7 (patch)
tree00cc7ffa4fadb610f958e5e43cd75fbffb3f4847 /using-git.texinfo
parentmerging branches (diff)
downloadusing-git-264e1604e157a84368294bf539655ca4f254ecc7.tar.gz
using-git-264e1604e157a84368294bf539655ca4f254ecc7.tar.bz2
using-git-264e1604e157a84368294bf539655ca4f254ecc7.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 a62fb0c..facc63d 100644
--- a/using-git.texinfo
+++ b/using-git.texinfo
@@ -432,7 +432,7 @@ file will contain:
<<<<<<< HEAD
Hello world
=======
-wello world!
+hello world!
>>>>>>> xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@end example