mercurial/mdiff.py

--- a/mercurial/mdiff.py	Thu Apr 05 17:14:11 2018 +0530
+++ b/mercurial/mdiff.py	Thu Apr 05 17:15:52 2018 +0530
@@ -78,7 +78,8 @@
             self.context = int(self.context)
         except ValueError:
             raise error.Abort(_('diff context lines count must be '
-                               'an integer, not %r') % self.context)
+                                'an integer, not %r') %
+                              pycompat.bytestr(self.context))
 
     def copy(self, **kwargs):
         opts = dict((k, getattr(self, k)) for k in self.defaults)