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. [ original upstream message ]

# $Id$

include tests/test-keyword tests/test-keyword.out

include MANIFEST.in