various merge improvements -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 various merge improvements add -C flag: force update and overwrite local changes add -m flag: allow merges with conflicts we no longer do merge by default and we print a warning message when the merge fails fix bug in printing merge failure message fix bug diffing files in 'm' state manifest hash: 75545a6db45d1e371082343d01c9f177df0f9db3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCpm6tywK+sNU5EO8RAvb+AJ0euC3YkUYA944hds3ooPxbw6NpVwCfc1dj TiNsPIds560S5jgw44eWNto= =GPXN -----END PGP SIGNATURE-----

     1

Files in this directory:

     2

     3

README - this file

     4

hg.1.txt - asciidoc source for the files

     5

hg.1 - groff man page for hg

     6

hg.1.html - man page in html format

     7

     8

How to generate the man page and html files

     9

    10

For now we use asciidoc which is available at:

    11

    12

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

    13

    14

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

    15

    16

asciidoc.py -d manpage -b docbook hg.1.txt

    17

xmlto man hg.1.xml

    18

    19

to display:

    20

    21

groff -mandoc -Tascii hg.1 | more

    22

    23

to create the html page (without stylesheets):

    24

    25

asciidoc.py -b html hg.1.txt