(0.9.2compat) add merge, resolve to restricted
This is not really backwards compatible (test only as comment)
and doesn't prevent extra conflicts with older Hg versions.
On the other hand it doesn't do any damage either and provides
the 3-way merge ease if possible.
$Id$
keyword extension for Mercurial SCM
===================================
install
-------
Either copy hgkw/keyword.py into the hgext directory of your
Mercurial installation.
Then add the lines:
[extensions]
hgext.keyword =
to your hgrc file.
Or 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
-------
Copy hgkw/keyword.py into the hgext directory of your Mercurial
source tree. Copy tests/test-keyword, tests/test-keyword.out into
the tests directory of your Mercurial source tree. Change to that
directory and run:
$ python run-tests.py test-keyword
and then keep your fingers crossed ...