[PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted From: Michael A Fetterman <Michael.Fetterman@cl.cam.ac.uk> If an "hg update" is attempted across branches, it is aborted with an error message, basically saying that "update -m" is required. Don't prompt the user for "keep vs delete" kinds of questions before deciding to abort. manifest hash: 250d3a0e866af2feac9344d499b26c254c33abc4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNeDywK+sNU5EO8RAu2BAJwNWXXN2L+4TnOUGaOe9iBj6CgOYgCfRKIE RF5czx2UQ2pSIP119xzq9mQ= =Akj6 -----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