foozy@708: $ \textbf{hg update}
foozy@708: abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes