Mercurial > hg
changeset 37371:d3286dd2ca2f
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
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Thu, 05 Apr 2018 17:29:32 +0530 |
| parents | b6de372b4309 |
| children | 1b2fa531fd7a |
| files | mercurial/mdiff.py |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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):