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$
keyword extension for Mercurial SCM
===================================
CAVEAT: Please use the keyword extension distributed with
Mercurial > 1.0.2!
For Mercurial 0.9.2 to 1.0.2 install the 0.9.2compat branch.
The default and stable branches are meant for development.
install
-------
Run "python setup.py install".
See also "pyton setup.py --help".
Then add the line:
[extensions]
keyword = /path/to/hgkw/keyword.py
to your hgrc, where /path/to/ is somewhere in your $PYTHONPATH.
first steps and online help
---------------------------
$ hg help keyword
$ hg kwdemo
testing
-------
$ cd tests
$ python run-tests.py --with-hg=/path/to/hg test-keyword