hgbook

diff en/examples/tour @ 699:a17d6390a480

More fixes to chapters 1 and 2.
author Bryan O'Sullivan <bos@serpentine.com>
date Sun May 03 20:27:09 2009 -0700 (2009-05-03)
parents c8d662d3cb40
children 477d6a3e5023
line diff
     1.1 --- a/en/examples/tour	Sun May 03 19:23:08 2009 -0700
     1.2 +++ b/en/examples/tour	Sun May 03 20:27:09 2009 -0700
     1.3 @@ -149,7 +149,7 @@
     1.4  
     1.5  #$ name:
     1.6  cp hello.c ../new-hello.c
     1.7 -sed -i '/printf/i\\tprintf("once more, hello.\\n");' ../new-hello.c
     1.8 +sed -i '/printf("hello,/i\\tprintf("once more, hello.\\n");' ../new-hello.c
     1.9  
    1.10  #$ name: merge.clone
    1.11  
    1.12 @@ -164,9 +164,12 @@
    1.13  
    1.14  hg log -r 5 | grep changeset | cut -c 16-19 2>/dev/null > /tmp/REV5.my-new-hello
    1.15  
    1.16 -#$ name: merge.cat
    1.17 -
    1.18 -cat hello.c
    1.19 +#$ name: merge.cat1
    1.20 +
    1.21 +cat hello.c
    1.22 +
    1.23 +#$ name: merge.cat2
    1.24 +
    1.25  cat ../my-hello/hello.c
    1.26  
    1.27  #$ name: merge.pull