Replace tkmerge with hgmerge
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Replace tkmerge with hgmerge
hgmerge attempts to find and use merge, kdiff3, tkmerge, and diff+patch.
hg will use hgmerge unless overridden with HGMERGE
manifest hash: 9137a620df4b235e66343b0fd0dba87fe631546e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCoRGrywK+sNU5EO8RAi2VAJ9bh97ChGJymP/p8rvCuyNAMnk1bQCgrIGP
vYI6qlyWKQZ01ObUTAIg92o=
=+mRH
-----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