# HG changeset patch
# User Pulkit Goyal <7895pulkit@gmail.com>
# Date 1512861504 -19800
# Node ID 93c4958d987c1cb3c7d67ab1001c49b0012c6985
# Parent  6eee2bcc57c47e77440d57bc5dbc577a94e1d04c
py3: handle keyword arguments correctly in simplemerge.py

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

diff -r 6eee2bcc57c4 -r 93c4958d987c mercurial/simplemerge.py
--- 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