##// END OF EJS Templates
filemerge: use fctx.write() in the internal:dump tool, instead of copy...
Phil Cohen -
r34078:cd38b83b default
parent child Browse files
Show More
@@ -468,7 +468,7 b' def _idump(repo, mynode, orig, fcd, fco,'
468 a = _workingpath(repo, fcd)
468 a = _workingpath(repo, fcd)
469 fd = fcd.path()
469 fd = fcd.path()
470
470
471 util.copyfile(a, a + ".local")
471 util.writefile(a + ".local", fcd.decodeddata())
472 repo.wwrite(fd + ".other", fco.data(), fco.flags())
472 repo.wwrite(fd + ".other", fco.data(), fco.flags())
473 repo.wwrite(fd + ".base", fca.data(), fca.flags())
473 repo.wwrite(fd + ".base", fca.data(), fca.flags())
474 return False, 1, False
474 return False, 1, False
General Comments 0
You need to be logged in to leave comments. Login now