--- a/hgext/lfs/__init__.py Sat Jan 27 14:53:16 2018 -0500
+++ b/hgext/lfs/__init__.py Sat Feb 03 21:26:12 2018 -0500
@@ -137,6 +137,7 @@
fileset,
hg,
localrepo,
+ merge,
minifileset,
node,
pycompat,
@@ -331,6 +332,8 @@
wrapfunction(hg, 'clone', wrapper.hgclone)
wrapfunction(hg, 'postshare', wrapper.hgpostshare)
+ wrapfunction(merge, 'applyupdates', wrapper.mergemodapplyupdates)
+
# Make bundle choose changegroup3 instead of changegroup2. This affects
# "hg bundle" command. Note: it does not cover all bundle formats like
# "packed1". Using "packed1" with lfs will likely cause trouble.