Mercurial > hg-stable

changeset 48396:6ce9ccfcac23

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: simplify slightly by using filectx.decodeddata() Differential Revision: https://phab.mercurial-scm.org/D11802
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 19 Nov 2021 18:48:34 -0800
parents 1eeec02cd919
children c12ed33558cb
files mercurial/filemerge.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/filemerge.py	Fri Nov 19 18:14:25 2021 -0800
+++ b/mercurial/filemerge.py	Fri Nov 19 18:48:34 2021 -0800
@@ -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