diff -r 8ae7626d8bf1 -r b605448eb254 mercurial/filemerge.py
--- a/mercurial/filemerge.py	Wed Feb 29 14:24:57 2012 +0100
+++ b/mercurial/filemerge.py	Thu Mar 01 17:35:12 2012 +0100
@@ -220,6 +220,8 @@
         util.copyfile(a, a + ".local")
         repo.wwrite(fd + ".other", fco.data(), fco.flags())
         repo.wwrite(fd + ".base", fca.data(), fca.flags())
+        os.unlink(b)
+        os.unlink(c)
         return 1 # unresolved
     else:
         args = _toolstr(ui, tool, "args", '$local $base $other')