diff --git a/mercurial/mdiff.py b/mercurial/mdiff.py --- a/mercurial/mdiff.py +++ b/mercurial/mdiff.py @@ -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)