Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgext/largefiles/uisetup.py
changeset 20638 b228ad1f79d7
parent 19779 fb6e87d93948
child 21048 ca7a57464fb3 
--- a/hgext/largefiles/uisetup.py	Tue Feb 25 20:28:40 2014 +0100
+++ b/hgext/largefiles/uisetup.py	Sun Mar 02 18:30:41 2014 +0100
@@ -96,8 +96,8 @@
                                    overrides.overridecat)
     entry = extensions.wrapfunction(merge, '_checkunknownfile',
                                     overrides.overridecheckunknownfile)
-    entry = extensions.wrapfunction(merge, 'manifestmerge',
-                                    overrides.overridemanifestmerge)
+    entry = extensions.wrapfunction(merge, 'calculateupdates',
+                                    overrides.overridecalculateupdates)
     entry = extensions.wrapfunction(filemerge, 'filemerge',
                                     overrides.overridefilemerge)
     entry = extensions.wrapfunction(cmdutil, 'copy',
Mercurial