Mercurial > hg > mercurial-crew-with-dirclash
view doc/README @ 1772:b1a7fd503a29
hgmerge: logic changes
Details:
- keep automatic merge conflicts in $LOCAL
- do not assume that $EDITOR returns proper error code
- fix a slight mistake in diff+patch merge success detection
(it could succeed if the $EDITOR failed to run)
author | Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> |
---|---|
date | Tue, 21 Feb 2006 15:48:16 -0600 |
parents | 7a3a3952c431 |
children | 8db8e1100f3f |
line wrap: on
line source
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