merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'
Without specifying the parent revision of the working copy, users will
update to tip, which is most likely the other head they were trying to
merge, not the revision they were at before the merge.
[ 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