Merge from BOS
authormpm@selenic.com
Wed, 20 Jul 2005 20:00:29 -0500
changeset 740 d2422f10c136
parent 722 e5b39ce2c3c9 (diff)
parent 739 36edb39e8e8c (current diff)
child 741 156dc2f3be7f
Merge from BOS manifest hash: 2276dbd96bb4221e579c871a1de2403c92c85659
.hgignore
MANIFEST.in
contrib/hgit
doc/FAQ.txt
doc/hg.1.txt
mercurial/commands.py
mercurial/hg.py
mercurial/util.py
templates/map
tests/test-help.out
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,7 +6,7 @@ include tests/README tests/run-tests tes
 include *.txt
 include templates/map templates/map-*[a-z]
 include templates/*.tmpl
-include doc/README doc/*.txt
+include doc/README doc/*.txt Makefile
 recursive-include contrib *
 include README
 include CONTRIBUTORS