Mercurial > hg > mercurial-source

diff mercurial/filemerge.py @ 16198:b605448eb254 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: remove temporary files when using internal:dump as merge-tool
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 01 Mar 2012 17:35:12 +0100 (2012-03-01)
parents e86dd8dfdea0
children 1970e6f61009 c7eef052c9e3
line wrap: on
line diff
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -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')