[PATCH 4 of 9] py3: convert kwargs' keys' to str using pycompat.strkwargs()

[Yuya Nishihara]

On Sat, 24 Jun 2017 01:24:58 +0530, Pulkit Goyal wrote:
> # HG changeset patch
> # User Pulkit Goyal <7895pulkit at gmail.com>
> # Date 1498081576 -19800
> #      Thu Jun 22 03:16:16 2017 +0530
> # Node ID 4e2f4798c3785ff716264679aa34122cc158bd02
> # Parent  4fc224b346e387d4f79ad368049bef13e5bde981
> py3: convert kwargs' keys' to str using pycompat.strkwargs()

> diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
> --- a/mercurial/filemerge.py
> +++ b/mercurial/filemerge.py
> @@ -534,7 +534,7 @@
>      props['templ'] = template
>      props['ctx'] = ctx
>      props['repo'] = repo
> -    templateresult = template.render(props)
> +    templateresult = template.render(pycompat.strkwargs(props))

This isn't kwargs. Dropped only this part.