--- a/hgext/largefiles/overrides.py Sun Oct 11 12:56:21 2015 -0700
+++ b/hgext/largefiles/overrides.py Sun Oct 11 20:47:04 2015 -0700
@@ -536,9 +536,11 @@
# Override filemerge to prompt the user about how they wish to merge
# largefiles. This will handle identical edits without prompting the user.
-def overridefilemerge(origfn, repo, mynode, orig, fcd, fco, fca, labels=None):
+def overridefilemerge(origfn, premerge, repo, mynode, orig, fcd, fco, fca,
+ labels=None):
if not lfutil.isstandin(orig):
- return origfn(repo, mynode, orig, fcd, fco, fca, labels=labels)
+ return origfn(premerge, repo, mynode, orig, fcd, fco, fca,
+ labels=labels)
ahash = fca.data().strip().lower()
dhash = fcd.data().strip().lower()