##// END OF EJS Templates
filemerge: remove temporary files when using internal:dump as merge-tool
Thomas Arendsen Hein -
r16205:b605448e stable
parent child Browse files
Show More
@@ -220,6 +220,8 b' def filemerge(repo, mynode, orig, fcd, f'
220 220 util.copyfile(a, a + ".local")
221 221 repo.wwrite(fd + ".other", fco.data(), fco.flags())
222 222 repo.wwrite(fd + ".base", fca.data(), fca.flags())
223 os.unlink(b)
224 os.unlink(c)
223 225 return 1 # unresolved
224 226 else:
225 227 args = _toolstr(ui, tool, "args", '$local $base $other')
General Comments 0
You need to be logged in to leave comments. Login now