diff --git a/mercurial/context.py b/mercurial/context.py index 9a3d9af8b1..bf79051137 100644 --- a/mercurial/context.py +++ b/mercurial/context.py @@ -354,7 +354,7 @@ class basectx(object): ctx2 = self.p1() if ctx2 is not None: ctx2 = self._repo[ctx2] - diffopts = patch.diffopts(self._repo.ui, opts) + diffopts = patch.diffopts(self._repo.ui, pycompat.byteskwargs(opts)) return patch.diff(self._repo, ctx2, self, match=match, opts=diffopts) def dirs(self):