Mercurial > hg > mercurial-crew-with-dirclash
annotate doc/README @ 415:c2b9502a4e96
[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-----
author | mpm@selenic.com |
---|---|
date | Tue, 21 Jun 2005 19:14:11 -0800 |
parents | 089594a5bbde |
children | 7a3a3952c431 |
rev | line source |
---|---|
177 | 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 |