foozy@708: $ \textbf{cd ../main} foozy@708: $ \textbf{hg pull ../stable} foozy@708: pulling from ../stable foozy@708: searching for changes foozy@708: adding changesets foozy@708: adding manifests foozy@708: adding file changes foozy@708: added 1 changesets with 1 changes to 1 files (+1 heads) foozy@708: (run 'hg heads' to see heads, 'hg merge' to merge) foozy@708: $ \textbf{hg merge} foozy@708: merging myfile foozy@708: 0 files updated, 1 files merged, 0 files removed, 0 files unresolved foozy@708: (branch merge, don't forget to commit) foozy@708: $ \textbf{hg commit -m 'Bring in bugfix from stable branch'} foozy@708: $ \textbf{cat myfile} foozy@708: This is a fix to a boring feature. foozy@708: This is exciting and new!