diff -r bfeaa88b875d -r d1f4e7fd970a mercurial/merge.py
--- a/mercurial/merge.py	Wed Apr 20 21:41:41 2011 +0200
+++ b/mercurial/merge.py	Wed Apr 20 22:43:31 2011 +0200
@@ -7,7 +7,7 @@
 
 from node import nullid, nullrev, hex, bin
 from i18n import _
-import util, filemerge, copies, subrepo
+import scmutil, util, filemerge, copies, subrepo
 import errno, os, shutil
 
 class mergestate(object):
@@ -303,7 +303,7 @@
             repo.ui.debug("removing %s\n" % f)
             os.unlink(repo.wjoin(f))
 
-    audit_path = util.path_auditor(repo.root)
+    audit_path = scmutil.path_auditor(repo.root)
 
     numupdates = len(action)
     for i, a in enumerate(action):