--- a/mercurial/merge.py	Tue Dec 12 18:16:23 2006 -0600
+++ b/mercurial/merge.py	Wed Dec 13 13:27:09 2006 -0600
@@ -7,8 +7,7 @@
 
 from node import *
 from i18n import gettext as _
-from demandload import *
-demandload(globals(), "errno util os tempfile")
+import errno, util, os, tempfile
 
 def filemerge(repo, fw, fo, wctx, mctx):
     """perform a 3-way merge in the working directory