D3132: py3: add missing b'' prefix in mdiff.py
pulkit (Pulkit Goyal)
phabricator at mercurial-scm.org
Thu Apr 5 09:48:28 EDT 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGd3286dd2ca2f: py3: add missing b'' 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
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):
To: pulkit, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list