bos@144: $ \textbf{hg merge}
bos@144: merging myfile
bos@144: 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
bos@144: (branch merge, don't forget to commit)
bos@144: $ \textbf{hg commit -m 'merged backout with previous tip'}
bos@144: $ \textbf{cat myfile}
bos@144: third change