# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 2012-03-01 16:35:12
# Node ID b605448eb25459a5d18aa1ba0af53449b42f77ba
# Parent  8ae7626d8bf1c41998bc62dbb929ae032c6ab6ff

filemerge: remove temporary files when using internal:dump as merge-tool

diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -220,6 +220,8 @@ def filemerge(repo, mynode, orig, fcd, f
         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')