--- a/hgext/largefiles/uisetup.py Wed Dec 14 15:41:08 2011 +0100
+++ b/hgext/largefiles/uisetup.py Fri Dec 09 17:35:00 2011 +0100
@@ -9,7 +9,7 @@
'''setup for largefiles extension: uisetup'''
from mercurial import archival, cmdutil, commands, extensions, filemerge, hg, \
- httprepo, localrepo, sshrepo, sshserver, wireproto
+ httprepo, localrepo, merge, sshrepo, sshserver, wireproto
from mercurial.i18n import _
from mercurial.hgweb import hgweb_mod, protocol
@@ -62,6 +62,10 @@
overrides.override_update)
entry = extensions.wrapcommand(commands.table, 'pull',
overrides.override_pull)
+ entry = extensions.wrapfunction(merge, '_checkunknown',
+ overrides.override_checkunknown)
+ entry = extensions.wrapfunction(merge, 'manifestmerge',
+ overrides.override_manifestmerge)
entry = extensions.wrapfunction(filemerge, 'filemerge',
overrides.override_filemerge)
entry = extensions.wrapfunction(cmdutil, 'copy',