D4699: py3: use pycompat.strkwargs() in contrib/simplemerge

[pulkit (Pulkit Goyal)]

This revision was automatically updated to reflect the committed changes.
Closed by commit rHG1dd82ecb869b: py3: use pycompat.strkwargs() in contrib/simplemerge (authored by pulkit, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D4699?vs=11295&id=11301

REVISION DETAIL
  https://phab.mercurial-scm.org/D4699

AFFECTED FILES
  contrib/simplemerge

CHANGE DETAILS

diff --git a/contrib/simplemerge b/contrib/simplemerge
--- a/contrib/simplemerge
+++ b/contrib/simplemerge
@@ -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()



To: pulkit, #hg-reviewers
Cc: mercurial-devel