1.1 --- a/en/examples/tour	Tue Mar 27 15:46:32 2007 -0700
     1.2 +++ b/en/examples/tour	Mon Mar 30 21:37:52 2009 +0800
     1.3 @@ -31,7 +31,7 @@
     1.4  #$ name: log-r
     1.5  
     1.6  hg log -r 3
     1.7 -hg log -r ff5d7b70a2a9
     1.8 +hg log -r 0272e0d5a517
     1.9  hg log -r 1 -r 4
    1.10  
    1.11  #$ name: log.range
    1.12 @@ -73,6 +73,10 @@
    1.13  
    1.14  hg commit
    1.15  
    1.16 +#$ name: merge.dummy1
    1.17 +
    1.18 +hg log -r 5 | grep changeset | cut -c 16-19 2>/dev/null > /tmp/REV5.my-hello
    1.19 +
    1.20  #$ name: tip
    1.21  
    1.22  hg tip -vp
    1.23 @@ -143,6 +147,10 @@
    1.24  sed -i '/printf/i\\tprintf("once more, hello.\\n");' hello.c
    1.25  hg commit -m 'A new hello for a new day.'
    1.26  
    1.27 +#$ name: merge.dummy2
    1.28 +
    1.29 +hg log -r 5 | grep changeset | cut -c 16-19 2>/dev/null > /tmp/REV5.my-new-hello
    1.30 +
    1.31  #$ name: merge.cat
    1.32  
    1.33  cat hello.c
    1.34 @@ -152,6 +160,10 @@
    1.35  
    1.36  hg pull ../my-hello
    1.37  
    1.38 +#$ name: merge.dummy3
    1.39 +
    1.40 +hg log -r 6 | grep changeset | cut -c 16-19 2>/dev/null > /tmp/REV6.my-new-hello
    1.41 +
    1.42  #$ name: merge.heads
    1.43  
    1.44  hg heads
    1.45 @@ -173,6 +185,10 @@
    1.46  
    1.47  hg commit -m 'Merged changes'
    1.48  
    1.49 +#$ name: merge.dummy4
    1.50 +
    1.51 +hg log -r 7 | grep changeset | cut -c 16-19 2>/dev/null > /tmp/REV7.my-new-hello
    1.52 +
    1.53  #$ name: merge.tip
    1.54  
    1.55  hg tip