changeset 35584 | 6f62a1c3e11d |
parent 35583 | 2f123f309f61 |
child 35850 | 079b27b5a869 |
--- a/mercurial/mdiff.py Fri Dec 29 05:27:00 2017 +0530 +++ b/mercurial/mdiff.py Fri Dec 29 05:28:05 2017 +0530 @@ -100,7 +100,7 @@ if blank and opts.ignoreblanklines: text = re.sub('\n+', '\n', text).strip('\n') if opts.ignorewseol: - text = re.sub(r'[ \t\r\f]+\n', r'\n', text) + text = re.sub(br'[ \t\r\f]+\n', r'\n', text) return text def splitblock(base1, lines1, base2, lines2, opts):