diff mercurial/filemerge.py @ 48971:4057563ebc6b

branching: merge stable into default
author Rapha?l Gom?s <rgomes@octobus.net>
date Thu, 17 Mar 2022 12:27:40 +0100
parents 642e31cb55f0 a54a866349ed
children f3aafd785e65
line wrap: on
line diff
--- 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]