# HG changeset patch
# User Benoit Boissinot <benoit.boissinot@ens-lyon.org>
# Date 1259013884 -3600
# Node ID f139814d20b335b34f82d0155e807d789b440ea9
# Parent  311eeb2f6951f640cc0d5aa1a2a3ccba1d71a128# Parent  e3237af51def26402a29bf0075f6d7ede3a7923f
merge with stable

diff -r 311eeb2f6951 -r f139814d20b3 tests/run-tests.py
--- a/tests/run-tests.py	Mon Nov 23 22:46:48 2009 +0100
+++ b/tests/run-tests.py	Mon Nov 23 23:04:44 2009 +0100
@@ -793,6 +793,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 311eeb2f6951 -r f139814d20b3 tests/test-churn
--- a/tests/test-churn	Mon Nov 23 22:46:48 2009 +0100
+++ b/tests/test-churn	Mon Nov 23 23:04:44 2009 +0100
@@ -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 311eeb2f6951 -r f139814d20b3 tests/test-patchbomb
--- a/tests/test-patchbomb	Mon Nov 23 22:46:48 2009 +0100
+++ b/tests/test-patchbomb	Mon Nov 23 23:04:44 2009 +0100
@@ -12,8 +12,6 @@
 echo "[extensions]" >> $HGRCPATH
 echo "patchbomb=" >> $HGRCPATH
 
-COLUMNS=80; export COLUMNS
-
 hg init t
 cd t
 echo a > a