##// END OF EJS Templates
filemerge: simplify slightly by using filectx.decodeddata()...
Martin von Zweigbergk -
r49170:6ce9ccfc default
parent child Browse files
Show More
@@ -995,7 +995,7 b' def _maketempfiles(repo, fco, fca, local'
995
995
996 def tempfromcontext(prefix, ctx):
996 def tempfromcontext(prefix, ctx):
997 f, name = maketempfrompath(prefix, ctx.path())
997 f, name = maketempfrompath(prefix, ctx.path())
998 data = repo.wwritedata(ctx.path(), ctx.data())
998 data = ctx.decodeddata()
999 f.write(data)
999 f.write(data)
1000 f.close()
1000 f.close()
1001 return name
1001 return name
General Comments 0
You need to be logged in to leave comments. Login now