diff --git a/hgext/largefiles/uisetup.py b/hgext/largefiles/uisetup.py index a3fcc8e3136bd19012d28b863d6bf4429948c573_aGdleHQvbGFyZ2VmaWxlcy91aXNldHVwLnB5..ef21a2c41629525048cb9c27d345aeaa55f8a823_aGdleHQvbGFyZ2VmaWxlcy91aXNldHVwLnB5 100644 --- a/hgext/largefiles/uisetup.py +++ b/hgext/largefiles/uisetup.py @@ -102,7 +102,7 @@ overrides.mergerecordupdates) entry = extensions.wrapfunction(merge, 'update', overrides.mergeupdate) - entry = extensions.wrapfunction(filemerge, 'filemerge', + entry = extensions.wrapfunction(filemerge, '_filemerge', overrides.overridefilemerge) entry = extensions.wrapfunction(cmdutil, 'copy', overrides.overridecopy) diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py index a3fcc8e3136bd19012d28b863d6bf4429948c573_bWVyY3VyaWFsL2ZpbGVtZXJnZS5weQ==..ef21a2c41629525048cb9c27d345aeaa55f8a823_bWVyY3VyaWFsL2ZpbGVtZXJnZS5weQ== 100644 --- a/mercurial/filemerge.py +++ b/mercurial/filemerge.py @@ -435,7 +435,7 @@ newlabels.append(_formatconflictmarker(repo, ca, tmpl, labels[2], pad)) return newlabels -def filemerge(repo, mynode, orig, fcd, fco, fca, labels=None): +def _filemerge(repo, mynode, orig, fcd, fco, fca, labels=None): """perform a 3-way merge in the working directory mynode = parent node before merge @@ -567,5 +567,8 @@ return r +def filemerge(repo, mynode, orig, fcd, fco, fca, labels=None): + return _filemerge(repo, mynode, orig, fcd, fco, fca, labels=labels) + # tell hggettext to extract docstrings from these functions: i18nfunctions = internals.values()