# HG changeset patch # User Martin von Zweigbergk # Date 1637376514 28800 # Node ID 6ce9ccfcac235949978b00c8eb68ef83131ee11f # Parent 1eeec02cd919c87512b1d13e9a44cdf309692320 filemerge: simplify slightly by using filectx.decodeddata() Differential Revision: https://phab.mercurial-scm.org/D11802 diff -r 1eeec02cd919 -r 6ce9ccfcac23 mercurial/filemerge.py --- 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