hg resolve: merge a given node into the working directory -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg resolve: merge a given node into the working directory This is the first pass at working directory-based merges. Doing a resolve adds a second parent to the working directory state for the next commit. manifest hash: 827b19995dd2d7686286da3b62c7d5fe3e0bc48c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoMSHywK+sNU5EO8RAnOkAJsHH9jviMJcQJ4JurFuSlrbIwKqRACdHgNC kkfoAxX2E5jkuOeSJ1Hjalk= =bdrT -----END PGP SIGNATURE-----

Files in this directory:

README - this file
hg.1.txt - asciidoc source for the files
hg.1 - groff man page for hg
hg.1.html - man page in html format

How to generate the man page and html files

For now we use asciidoc which is available at:

http://www.methods.co.nz/asciidoc/

the file hg.1.txt is the input file, to generate the man page:

asciidoc.py -d manpage -b docbook hg.1.txt
xmlto man hg.1.xml

to display:

groff -mandoc -Tascii hg.1 | more

to create the html page (without stylesheets):

asciidoc.py -b html hg.1.txt