Fix 3-way-merge of original parent, workdir and new parent.
The dirstate has to match what is in the repository (what would be
checked out with 'hg update -C'), because the resulting file may be
identical to the new parent, or it may be completely different.
Previously the dirstate wasn't updated, so if you changed the file to
look like the original parent, it might be considered unmodified
relative to the new parent.
Mercurial's documentation is currently kept in ASCIIDOC format, which
is a simple plain text format that's easy to read and edit. It's also
convertible to a variety of other formats including standard UNIX man
page format and HTML.
To do this, you'll need to install ASCIIDOC:
http://www.methods.co.nz/asciidoc/
To generate the man page:
asciidoc -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 -b html hg.1.txt