changeset 45557 | 2c86b9587740 |
parent 45545 | e5e1285b6f6f |
child 45682 | d2e1dcd4490d |
--- a/hgext/largefiles/overrides.py Mon Sep 21 10:09:39 2020 -0700 +++ b/hgext/largefiles/overrides.py Mon Sep 21 11:12:58 2020 -0700 @@ -1717,7 +1717,7 @@ return err -@eh.wrapfunction(merge, b'update') +@eh.wrapfunction(merge, b'_update') def mergeupdate(orig, repo, node, branchmerge, force, *args, **kwargs): matcher = kwargs.get('matcher', None) # note if this is a partial update