1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/en/examples/branching.merge.out	Wed Jan 07 23:38:40 2009 -0500
     1.3 @@ -0,0 +1,17 @@
     1.4 +$ \textbf{cd ../main}
     1.5 +$ \textbf{hg pull ../stable}
     1.6 +pulling from ../stable
     1.7 +searching for changes
     1.8 +adding changesets
     1.9 +adding manifests
    1.10 +adding file changes
    1.11 +added 1 changesets with 1 changes to 1 files (+1 heads)
    1.12 +(run 'hg heads' to see heads, 'hg merge' to merge)
    1.13 +$ \textbf{hg merge}
    1.14 +merging myfile
    1.15 +0 files updated, 1 files merged, 0 files removed, 0 files unresolved
    1.16 +(branch merge, don't forget to commit)
    1.17 +$ \textbf{hg commit -m 'Bring in bugfix from stable branch'}
    1.18 +$ \textbf{cat myfile}
    1.19 +This is a fix to a boring feature.
    1.20 +This is exciting and new!