Submitter | phabricator |
---|---|
Date | Nov. 24, 2021, 5:05 p.m. |
Message ID | <differential-rev-PHID-DREV-2ccunmpkdsk7lrzsrbtv-req@mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/50128/ |
State | Superseded |
Headers | show |
Comments
Patch
diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py --- a/mercurial/filemerge.py +++ b/mercurial/filemerge.py @@ -995,7 +995,7 @@ def tempfromcontext(prefix, ctx): f, name = maketempfrompath(prefix, ctx.path()) - data = repo.wwritedata(ctx.path(), ctx.data()) + data = ctx.decodeddata() f.write(data) f.close() return name