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 26605 ef21a2c41629
parent 26417 9a466b9f9792
child 27586 42910f9fffeb 
--- a/hgext/largefiles/uisetup.py	Fri Oct 09 01:19:37 2015 +0200
+++ b/hgext/largefiles/uisetup.py	Sun Oct 11 12:31:08 2015 -0700
@@ -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)
Mercurial