diff -r 920cca6c8462 -r 8384553b1684 mercurial/context.py
--- a/mercurial/context.py	Sun Dec 10 04:45:41 2017 +0530
+++ b/mercurial/context.py	Sun Dec 10 04:45:56 2017 +0530
@@ -354,7 +354,7 @@
             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):