##// END OF EJS Templates
filemerge: don't pass function name as loadpath's module_name param
hindlemail -
r38176:dea39031 default
parent child Browse files
Show More
@@ -574,7 +574,7 b' def _xmerge(repo, mynode, orig, fcd, fco'
574 try:
574 try:
575 # avoid cycle cmdutil->merge->filemerge->extensions->cmdutil
575 # avoid cycle cmdutil->merge->filemerge->extensions->cmdutil
576 from . import extensions
576 from . import extensions
577 mod = extensions.loadpath(toolpath, 'hgmerge.%s' % scriptfn)
577 mod = extensions.loadpath(toolpath, 'hgmerge.%s' % tool)
578 except Exception:
578 except Exception:
579 raise error.Abort(_("loading python merge script failed: %s") %
579 raise error.Abort(_("loading python merge script failed: %s") %
580 toolpath)
580 toolpath)
General Comments 0
You need to be logged in to leave comments. Login now