Mercurial > hg-stable
changeset 16205:b605448eb254 stable
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 |
| parents | 8ae7626d8bf1 |
| children | 1970e6f61009 374e08439ea6 |
| files | mercurial/filemerge.py |
| diffstat | 1 files changed, 2 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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')