changeset 36835 | 5bc7ff103081 |
parent 36424 | 3ab9d74dd1c5 |
child 36976 | a4a95bd7158d |
--- a/mercurial/filemerge.py Sat Mar 10 15:50:09 2018 +0900 +++ b/mercurial/filemerge.py Sat Mar 10 15:57:16 2018 +0900 @@ -674,7 +674,7 @@ pre = "%s~%s." % (os.path.basename(fullbase), prefix) (fd, name) = tempfile.mkstemp(prefix=pre, suffix=ext) data = repo.wwritedata(ctx.path(), ctx.data()) - f = os.fdopen(fd, pycompat.sysstr("wb")) + f = os.fdopen(fd, r"wb") f.write(data) f.close() return name