diff -r c33427080671 -r 21b8ce4d3331 mercurial/merge.py
--- a/mercurial/merge.py	Fri May 06 12:09:20 2011 +0200
+++ b/mercurial/merge.py	Fri May 06 09:54:06 2011 +0200
@@ -302,7 +302,7 @@
             repo.ui.debug("removing %s\n" % f)
             os.unlink(repo.wjoin(f))
 
-    audit_path = scmutil.path_auditor(repo.root)
+    audit_path = scmutil.pathauditor(repo.root)
 
     numupdates = len(action)
     for i, a in enumerate(action):