Mercurial > hg > mercurial-crew-with-dirclash

diff mercurial/merge.py @ 3886:abaee83ce0a6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace demandload with new demandimport
author Matt Mackall <mpm@selenic.com>
date Wed, 13 Dec 2006 13:27:09 -0600
parents 1e0b94cfba0e
children 6b4127c7d52a
line wrap: on
line diff
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -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