--- a/mercurial/mdiff.py Sat Mar 03 11:19:43 2018 -0500
+++ b/mercurial/mdiff.py Sat Mar 03 11:26:30 2018 -0500
@@ -30,17 +30,9 @@
fixws = bdiff.fixws
patches = mpatch.patches
patchedsize = mpatch.patchedsize
-_textdiff = bdiff.bdiff
+textdiff = bdiff.bdiff
splitnewlines = bdiff.splitnewlines
-# On Python 3, util.buffer() creates a memoryview, which appears not
-# supporting the buffer protocol
-if pycompat.ispy3:
- def textdiff(a, b):
- return _textdiff(bytes(a), bytes(b))
-else:
- textdiff = _textdiff
-
class diffopts(object):
'''context is the number of context lines
text treats all files as text