contrib/simplemerge

--- a/contrib/simplemerge	Sun Sep 23 23:59:35 2018 +0300
+++ b/contrib/simplemerge	Mon Sep 24 00:00:04 2018 +0300
@@ -12,6 +12,7 @@
     context,
     error,
     fancyopts,
+    pycompat,
     simplemerge,
     ui as uimod,
 )
@@ -71,7 +72,7 @@
                                      context.arbitraryfilectx(local),
                                      context.arbitraryfilectx(base),
                                      context.arbitraryfilectx(other),
-                                     **opts))
+                                     **pycompat.strkwargs(opts)))
 except ParseError as e:
     sys.stdout.write(b"%s: %s\n" % (sys.argv[0], e))
     showhelp()