diff -r 12c7cea6235c -r 098a274764b3 mercurial/filemerge.py
--- a/mercurial/filemerge.py	Thu Apr 17 14:54:46 2014 +0200
+++ b/mercurial/filemerge.py	Thu Apr 17 14:54:46 2014 +0200
@@ -334,10 +334,10 @@
             if onfailure:
                 ui.warn(onfailure % fd)
         else:
-            os.unlink(back)
+            util.unlink(back)
 
-        os.unlink(b)
-        os.unlink(c)
+        util.unlink(b)
+        util.unlink(c)
         return r
 
     if not r and (_toolbool(ui, tool, "checkconflicts") or
@@ -368,10 +368,10 @@
         if onfailure:
             ui.warn(onfailure % fd)
     else:
-        os.unlink(back)
+        util.unlink(back)
 
-    os.unlink(b)
-    os.unlink(c)
+    util.unlink(b)
+    util.unlink(c)
     return r
 
 # tell hggettext to extract docstrings from these functions: