aboutsummaryrefslogtreecommitdiffstats
path: root/using-git.texinfo
diff options
context:
space:
mode:
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