Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: add missing b'' prefix in mdiff.py
authorPulkit Goyal <7895pulkit@gmail.com>
Thu, 05 Apr 2018 17:29:32 +0530
changeset 37371 d3286dd2ca2f
parent 37370 b6de372b4309
child 37372 1b2fa531fd7a
py3: add missing b'' prefix in mdiff.py Transformer won't add b'' prefix because that value is already have a r'' prefix. # skip-blame because just b'' prefix Differential Revision: https://phab.mercurial-scm.org/D3132
mercurial/mdiff.py file | annotate | diff | comparison | revisions 
--- a/mercurial/mdiff.py	Thu Apr 05 17:15:52 2018 +0530
+++ b/mercurial/mdiff.py	Thu Apr 05 17:29:32 2018 +0530
@@ -97,7 +97,7 @@
     if blank and opts.ignoreblanklines:
         text = re.sub('\n+', '\n', text).strip('\n')
     if opts.ignorewseol:
-        text = re.sub(br'[ \t\r\f]+\n', r'\n', text)
+        text = re.sub(br'[ \t\r\f]+\n', br'\n', text)
     return text
 
 def splitblock(base1, lines1, base2, lines2, opts):
mercurial