Mercurial > hg
changeset 39791:1dd82ecb869b
py3: use pycompat.strkwargs() in contrib/simplemerge
Differential Revision: https://phab.mercurial-scm.org/D4699
| author | Pulkit Goyal <pulkit@yandex-team.ru> |
|---|---|
| date | Mon, 24 Sep 2018 00:00:04 +0300 |
| parents | d3e940a32be0 |
| children | ff0060d2a099 |
| files | contrib/simplemerge |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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()