diff -r 6ba58ab719e5 -r f6f23ecafc9b mercurial/merge.py
--- a/mercurial/merge.py	Tue Jan 15 01:05:12 2013 +0100
+++ b/mercurial/merge.py	Tue Jan 15 01:05:12 2013 +0100
@@ -367,7 +367,7 @@
         if os.path.lexists(repo.wjoin(f)):
             repo.ui.debug("removing %s\n" % f)
             audit(f)
-            os.unlink(repo.wjoin(f))
+            util.unlinkpath(repo.wjoin(f))
 
     numupdates = len(actions)
     for i, a in enumerate(actions):