merge.
authorVadim Gelfer <vadim.gelfer@gmail.com>
Fri, 18 Aug 2006 17:02:38 -0700
changeset 2952 6ba3409f9725
parent 2951 5ddf7d305a27 (diff)
parent 2950 f7bed40e259a (current diff)
child 2954 51ba31494c69
merge.
mercurial/patch.py
--- a/mercurial/patch.py
+++ b/mercurial/patch.py
@@ -9,7 +9,7 @@ from demandload import demandload
 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