hgmerge: various cleanups
Details:
- put temporary file names into variables
- make all temporary file names end with random part
- cleanup FileMerge handling
- do not use hardlinks in FileMerge change test (breaks on FAT)
- try harder to keep file mtime unchanged in case of failed merge
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