1.1 --- a/en/examples/branch-repo	Mon Apr 16 17:21:38 2007 -0700
     1.2 +++ b/en/examples/branch-repo	Thu Dec 04 00:30:24 2008 -0500
     1.3 @@ -30,6 +30,19 @@
     1.4  cd ..
     1.5  hg clone myproject my-feature
     1.6  cd my-feature
     1.7 -echo "I'm adding a new feature with my mind!" > mynewfile
     1.8 +echo 'This sure is an exciting new feature!' > mynewfile
     1.9  hg commit -A -m 'New feature'
    1.10 +hg push
    1.11  
    1.12 +#$ name: pull
    1.13 +
    1.14 +cd ..
    1.15 +hg clone myproject myproject-merge
    1.16 +cd myproject-merge
    1.17 +hg pull ../myproject-1.0.1
    1.18 +
    1.19 +#$ name: merge
    1.20 +
    1.21 +hg merge
    1.22 +hg commit -m 'Merge bugfix from 1.0.1 branch'
    1.23 +hg push