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 'merged backout with previous tip'}
foozy@708: $ \textbf{cat myfile}
foozy@708: first change
foozy@708: third change