1.1 --- a/en/examples/tour	Sun May 03 20:27:09 2009 -0700
     1.2 +++ b/en/examples/tour	Tue Nov 24 15:52:19 2009 +0100
     1.3 @@ -151,13 +151,18 @@
     1.4  cp hello.c ../new-hello.c
     1.5  sed -i '/printf("hello,/i\\tprintf("once more, hello.\\n");' ../new-hello.c
     1.6  
     1.7 +my-text-editor()
     1.8 +{
     1.9 +cp ../new-hello.c hello.c
    1.10 +}
    1.11 +
    1.12  #$ name: merge.clone
    1.13  
    1.14  cd ..
    1.15  hg clone hello my-new-hello
    1.16  cd my-new-hello
    1.17 -# The file new-hello.c is lightly edited.
    1.18 -cp ../new-hello.c hello.c
    1.19 +# Make some simple edits to hello.c.
    1.20 +my-text-editor hello.c
    1.21  hg commit -m 'A new hello for a new day.'
    1.22  
    1.23  #$ name: merge.dummy2