--- a/mercurial/filemerge.py Tue Mar 15 10:36:28 2022 +0100
+++ b/mercurial/filemerge.py Thu Mar 17 12:27:40 2022 +0100
@@ -754,8 +754,7 @@
# Remove the .orig to make syntax-highlighting more likely.
if localoutputpath.endswith(b'.orig'):
localoutputpath, ext = os.path.splitext(localoutputpath)
- localdata = util.readfile(localpath)
- files.append((b"local", localoutputpath, localdata))
+ files.append((b"local", localoutputpath, backup.data()))
with _maketempfiles(files) as temppaths:
basepath, otherpath = temppaths[:2]