# HG changeset patch
# User Patrick Mezard <pmezard@gmail.com>
# Date 1223831516 -7200
# Node ID 0b74409d58589c286d98d143956a6aa5072917ab
# Parent  ccbd39cad3c35a7f2534767749d3639ab4fce24b# Parent  967adcf5910da0b456a8db404154670dedf11ca8
Merge with crew-stable

diff -r ccbd39cad3c3 -r 0b74409d5858 tests/test-doctest.py
--- a/tests/test-doctest.py	Sat Oct 11 13:07:29 2008 +0200
+++ b/tests/test-doctest.py	Sun Oct 12 19:11:56 2008 +0200
@@ -1,5 +1,7 @@
 # this is hack to make sure no escape characters are inserted into the output
-import os; del os.environ['TERM'] 
+import os;
+if 'TERM' in os.environ:
+    del os.environ['TERM'] 
 import doctest
 
 import mercurial.changelog