Mercurial > hg
diff hgext/largefiles/uisetup.py @ 15674:7b7f03502b5a
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 16 Dec 2011 19:05:59 -0600 |
parents | 9d7a83a42f8c 9036c7d106bf |
children | f19d5c852f9b |
line wrap: on
line diff
--- a/hgext/largefiles/uisetup.py Thu Dec 15 16:50:21 2011 -0600 +++ b/hgext/largefiles/uisetup.py Fri Dec 16 19:05:59 2011 -0600 @@ -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 @@ -63,6 +63,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',