# HG changeset patch
# User Pulkit Goyal <7895pulkit@gmail.com>
# Date 2018-04-05 11:45:52
# Node ID b6de372b43090c4574990966a1bdaca8c34a934b
# Parent  22f19da5736e0608b84c9124ebd9563278ab3f41

py3: fix error string with bytestr() on repr()d value

Differential Revision: https://phab.mercurial-scm.org/D3131

diff --git a/mercurial/mdiff.py b/mercurial/mdiff.py
--- a/mercurial/mdiff.py
+++ b/mercurial/mdiff.py
@@ -78,7 +78,8 @@ class diffopts(object):
             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)