Mercurial > public > mercurial-scm > hg-stable

diff mercurial/filemerge.py @ 38192:dea3903175ee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: don't pass function name as loadpath's module_name param
author hindlemail <tom_hindle@sil.org>
date Thu, 24 May 2018 15:56:47 -0600
parents 242eb5132203
children aac4be30e250
line wrap: on
line diff
--- a/mercurial/filemerge.py	Tue May 22 18:10:37 2018 +0200
+++ b/mercurial/filemerge.py	Thu May 24 15:56:47 2018 -0600
@@ -574,7 +574,7 @@
             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)