changeset 2952:6ba3409f9725

merge.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Fri, 18 Aug 2006 17:02:38 -0700
parents 5ddf7d305a27 (diff) f7bed40e259a (current diff)
children 51ba31494c69
files mercurial/patch.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/patch.py	Fri Aug 18 15:53:30 2006 -0700
+++ b/mercurial/patch.py	Fri Aug 18 17:02:38 2006 -0700
@@ -9,7 +9,7 @@
 from i18n import gettext as _
 from node import *
 demandload(globals(), "cmdutil mdiff util")
-demandload(globals(), "cStringIO email.Parser os re shutil sys tempfile")
+demandload(globals(), "cStringIO email.Parser errno os re shutil sys tempfile")
 
 # helper functions