Mercurial > hg
annotate MANIFEST.in @ 275:61d45b0ba8fb
various merge improvements
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
various merge improvements
add -C flag: force update and overwrite local changes
add -m flag: allow merges with conflicts
we no longer do merge by default
and we print a warning message when the merge fails
fix bug in printing merge failure message
fix bug diffing files in 'm' state
manifest hash: 75545a6db45d1e371082343d01c9f177df0f9db3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCpm6tywK+sNU5EO8RAvb+AJ0euC3YkUYA944hds3ooPxbw6NpVwCfc1dj
TiNsPIds560S5jgw44eWNto=
=GPXN
-----END PGP SIGNATURE-----
| author | mpm@selenic.com |
|---|---|
| date | Tue, 07 Jun 2005 20:06:05 -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 |