--- a/mercurial/simplemerge.py	Sun Dec 10 04:48:12 2017 +0530
+++ b/mercurial/simplemerge.py	Sun Dec 10 04:48:24 2017 +0530
@@ -418,6 +418,8 @@
 
     The merged result is written into `localctx`.
     """
+    opts = pycompat.byteskwargs(opts)
+
     def readctx(ctx):
         # Merges were always run in the working copy before, which means
         # they used decoded data, if the user defined any repository