diff en/examples/tour @ 828:477d6a3e5023

Many final changes.

--- a/en/examples/tour	Sun May 03 20:27:28 2009 -0700
+++ b/en/examples/tour	Mon May 04 23:52:38 2009 -0700
@@ -151,13 +151,18 @@
 cp hello.c ../new-hello.c
 sed -i '/printf("hello,/i\\tprintf("once more, hello.\\n");' ../new-hello.c
 
+my-text-editor()
+{
+cp ../new-hello.c hello.c
+}
+
 #$ name: merge.clone
 
 cd ..
 hg clone hello my-new-hello
 cd my-new-hello
-# The file new-hello.c is lightly edited.
-cp ../new-hello.c hello.c
+# Make some simple edits to hello.c.
+my-text-editor hello.c
 hg commit -m 'A new hello for a new day.'
 
 #$ name: merge.dummy2