--- a/hgext/largefiles/overrides.py Mon Feb 01 20:28:32 2016 -0800
+++ b/hgext/largefiles/overrides.py Mon Feb 01 20:28:32 2016 -0800
@@ -452,7 +452,8 @@
# writing the files into the working copy and lfcommands.updatelfiles
# will update the largefiles.
def overridecalculateupdates(origfn, repo, p1, p2, pas, branchmerge, force,
- acceptremote, followcopies, matcher=None):
+ acceptremote, followcopies, matcher=None,
+ mergeforce=False):
overwrite = force and not branchmerge
actions, diverge, renamedelete = origfn(
repo, p1, p2, pas, branchmerge, force, acceptremote,