Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: use pycompat.strkwargs() in contrib/simplemerge
authorPulkit Goyal <pulkit@yandex-team.ru>
Mon, 24 Sep 2018 00:00:04 +0300
changeset 39791 1dd82ecb869b
parent 39790 d3e940a32be0
child 39792 ff0060d2a099
py3: use pycompat.strkwargs() in contrib/simplemerge Differential Revision: https://phab.mercurial-scm.org/D4699
contrib/simplemerge file | annotate | diff | comparison | revisions 
--- 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()
Mercurial