merge with stable

This commit is contained in:
Matt Mackall 2013-12-01 21:24:48 -06:00
commit 5c689e700e

View File

@ -122,6 +122,7 @@ be separated by whitespaces::
(options, args) = optparser.parse_args()
if options.doctest:
import os
if 'TERM' in os.environ:
del os.environ['TERM']
import doctest