Mercurial > hg
annotate MANIFEST.in @ 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 | 06bc1ef248a6 |
| children | 20fc66131bc0 |
| rev | line source |
|---|---|
| 7 | 1 include hg |
| 2 recursive-include mercurial *.py | |
| 3 include tkmerge | |
| 188 | 4 include hgweb.cgi |
| 5 include hgeditor rewrite-log convert-repo | |
| 6 include tests/* | |
| 7 | 7 include *.txt |
|
218
06bc1ef248a6
hgweb: put map-raw in setup.py and MANIFEST.in
mpm@selenic.com
parents:
188
diff
changeset
|
8 include templates/map templates/map-*[a-z] |
| 188 | 9 include templates/*.tmpl |
| 10 include doc/* | |
| 7 | 11 include README |