Mercurial > hg > mercurial-crew-with-dirclash
annotate MANIFEST.in @ 232:fc4a6e5b5812
hg resolve: merge a given node into the working directory
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
hg resolve: merge a given node into the working directory
This is the first pass at working directory-based merges. Doing a
resolve adds a second parent to the working directory state for the
next commit.
manifest hash: 827b19995dd2d7686286da3b62c7d5fe3e0bc48c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCoMSHywK+sNU5EO8RAnOkAJsHH9jviMJcQJ4JurFuSlrbIwKqRACdHgNC
kkfoAxX2E5jkuOeSJ1Hjalk=
=bdrT
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Fri, 03 Jun 2005 12:58:47 -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 |