--- a/hgext/lfs/__init__.py Sun Feb 11 00:40:27 2018 -0500
+++ b/hgext/lfs/__init__.py Sun Feb 11 13:25:56 2018 -0500
@@ -137,7 +137,6 @@
fileset,
hg,
localrepo,
- merge,
minifileset,
node,
pycompat,
@@ -333,8 +332,6 @@
wrapfunction(hg, 'clone', wrapper.hgclone)
wrapfunction(hg, 'postshare', wrapper.hgpostshare)
- wrapfunction(merge, 'applyupdates', wrapper.mergemodapplyupdates)
-
scmutil.fileprefetchhooks.add('lfs', wrapper._prefetchfiles)
# Make bundle choose changegroup3 instead of changegroup2. This affects