diff en/examples/tour @ 826:a17d6390a480

More fixes to chapters 1 and 2.

--- a/en/examples/tour	Sun May 03 19:23:31 2009 -0700
+++ b/en/examples/tour	Sun May 03 20:27:09 2009 -0700
@@ -149,7 +149,7 @@
 
 #$ name:
 cp hello.c ../new-hello.c
-sed -i '/printf/i\\tprintf("once more, hello.\\n");' ../new-hello.c
+sed -i '/printf("hello,/i\\tprintf("once more, hello.\\n");' ../new-hello.c
 
 #$ name: merge.clone
 
@@ -164,9 +164,12 @@
 
 hg log -r 5 | grep changeset | cut -c 16-19 2>/dev/null > /tmp/REV5.my-new-hello
 
-#$ name: merge.cat
+#$ name: merge.cat1
 
 cat hello.c
+
+#$ name: merge.cat2
+
 cat ../my-hello/hello.c
 
 #$ name: merge.pull