foozy@708: $ \textbf{hg merge}
foozy@708: merging hello.c
foozy@708: 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
foozy@708: (branch merge, don't forget to commit)