diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py --- a/mercurial/filemerge.py +++ b/mercurial/filemerge.py @@ -574,7 +574,7 @@ def _xmerge(repo, mynode, orig, fcd, fco try: # avoid cycle cmdutil->merge->filemerge->extensions->cmdutil from . import extensions - mod = extensions.loadpath(toolpath, 'hgmerge.%s' % scriptfn) + mod = extensions.loadpath(toolpath, 'hgmerge.%s' % tool) except Exception: raise error.Abort(_("loading python merge script failed: %s") % toolpath)