Patchwork D3132: py3: add missing b'' prefix in mdiff.py

login
register
mail settings
Submitter phabricator
Date April 5, 2018, 1:48 p.m.
Message ID <95cb210e4b0a98e6401a812205bae62c@localhost.localdomain>
Download mbox | patch
Permalink /patch/30373/
State Not Applicable
Headers show

Comments

phabricator - April 5, 2018, 1:48 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGd3286dd2ca2f: py3: add missing b&#039;&#039; prefix in mdiff.py (authored by pulkit, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D3132?vs=7715&id=7730

REVISION DETAIL
  https://phab.mercurial-scm.org/D3132

AFFECTED FILES
  mercurial/mdiff.py

CHANGE DETAILS




To: pulkit, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/mercurial/mdiff.py b/mercurial/mdiff.py
--- a/mercurial/mdiff.py
+++ b/mercurial/mdiff.py
@@ -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):