hg: say 'hg update' instead of 'hg up' in merge status message
Includes the change to the message itself, along with several test
output files that also had to change.
marked working directory as branch abranch
applying patch from stdin
applying patch from stdin
applying patch from stdin
applying patch from stdin