tests/test-resolve.out

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.

adding file
% create a second head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
% failing merge
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
% resolve -l, should be empty