diff en/examples/tour @ 94:0b97b0bdc830

Basic merge coverage.

--- a/en/examples/tour	Thu Oct 12 16:27:00 2006 -0700
+++ b/en/examples/tour	Fri Oct 13 13:55:06 2006 -0700
@@ -105,6 +105,7 @@
 
 hg update 2
 hg parents
+hg update
 
 #$ name: clone-push
 
@@ -132,5 +133,44 @@
 
 hg push http://hg.serpentine.com/tutorial/hello
 
-#$ name:
-exit 0
+#$ name: merge.clone
+
+cd ..
+hg clone hello my-new-hello
+cd my-new-hello
+sed -i '/printf/i\\tprintf("once more, hello.\\n");' hello.c
+hg commit -m 'A new hello for a new day.'
+
+#$ name: merge.cat
+
+cat hello.c
+cat ../my-hello/hello.c
+
+#$ name: merge.pull
+
+hg pull ../my-hello
+
+#$ name: merge.heads
+
+hg heads
+
+#$ name: merge.update
+
+hg update
+
+#$ name: merge.merge
+
+hg merge
+
+#$ name: merge.parents
+
+hg parents
+cat hello.c
+
+#$ name: merge.commit
+
+hg commit -m 'Merged changes'
+
+#$ name: merge.tip
+
+hg tip