D4699: py3: use pycompat.strkwargs() in contrib/simplemerge
pulkit (Pulkit Goyal)
phabricator at mercurial-scm.org
Mon Sep 24 01:09:56 UTC 2018
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
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
More information about the Mercurial-devel
mailing list