# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1259079833 21600
# Node ID b22ff29a3fbb1c1841c1c5b62f510c5ca2c782c3
# Parent  f5fa1b5863de159ee684262caa77dc10a3bd5344# Parent  e3237af51def26402a29bf0075f6d7ede3a7923f
Merge with crew

diff -r f5fa1b5863de -r b22ff29a3fbb contrib/win32/mercurial.iss
--- a/contrib/win32/mercurial.iss	Mon Nov 23 15:15:01 2009 -0200
+++ b/contrib/win32/mercurial.iss	Tue Nov 24 10:23:53 2009 -0600
@@ -62,6 +62,7 @@
 Source: dist\add_path.exe; DestDir: {app}
 Source: doc\*.html; DestDir: {app}\Docs
 Source: doc\style.css; DestDir: {app}\Docs
+Source: help\*.txt; DestDir: {app}\help
 Source: locale\*.*; DestDir: {app}\locale; Flags: recursesubdirs createallsubdirs
 Source: templates\*.*; DestDir: {app}\Templates; Flags: recursesubdirs createallsubdirs
 Source: CONTRIBUTORS; DestDir: {app}; DestName: Contributors.txt
diff -r f5fa1b5863de -r b22ff29a3fbb tests/run-tests.py
--- a/tests/run-tests.py	Mon Nov 23 15:15:01 2009 -0200
+++ b/tests/run-tests.py	Tue Nov 24 10:23:53 2009 -0600
@@ -785,6 +785,7 @@
     os.environ['TZ'] = 'GMT'
     os.environ["EMAIL"] = "Foo Bar <foo.bar@example.com>"
     os.environ['CDPATH'] = ''
+    os.environ['COLUMNS'] = '80'
 
     global TESTDIR, HGTMP, INST, BINDIR, PYTHONDIR, COVERAGE_FILE
     TESTDIR = os.environ["TESTDIR"] = os.getcwd()
diff -r f5fa1b5863de -r b22ff29a3fbb tests/test-churn
--- a/tests/test-churn	Mon Nov 23 15:15:01 2009 -0200
+++ b/tests/test-churn	Tue Nov 24 10:23:53 2009 -0600
@@ -3,8 +3,6 @@
 echo "[extensions]" >> $HGRCPATH
 echo "churn=" >> $HGRCPATH
 
-COLUMNS=80; export COLUMNS
-
 echo % create test repository
 hg init repo
 cd repo
diff -r f5fa1b5863de -r b22ff29a3fbb tests/test-patchbomb
--- a/tests/test-patchbomb	Mon Nov 23 15:15:01 2009 -0200
+++ b/tests/test-patchbomb	Tue Nov 24 10:23:53 2009 -0600
@@ -12,8 +12,6 @@
 echo "[extensions]" >> $HGRCPATH
 echo "patchbomb=" >> $HGRCPATH
 
-COLUMNS=80; export COLUMNS
-
 hg init t
 cd t
 echo a > a