diff -r 0e6cea0c3113 -r c642c03969ff mercurial/filemerge.py --- a/mercurial/filemerge.py Thu Aug 31 01:54:48 2023 +0200 +++ b/mercurial/filemerge.py Thu Aug 31 02:41:33 2023 +0200 @@ -834,12 +834,13 @@ # avoid cycle cmdutil->merge->filemerge->extensions->cmdutil from . import extensions - mod = extensions.loadpath(toolpath, b'hgmerge.%s' % tool) + mod_name = 'hgmerge.%s' % pycompat.sysstr(tool) + mod = extensions.loadpath(toolpath, mod_name) except Exception: raise error.Abort( _(b"loading python merge script failed: %s") % toolpath ) - mergefn = getattr(mod, scriptfn, None) + mergefn = getattr(mod, pycompat.sysstr(scriptfn), None) if mergefn is None: raise error.Abort( _(b"%s does not have function: %s") % (toolpath, scriptfn)