--- a/hgext/largefiles/overrides.py Tue Apr 22 13:32:05 2014 -0700
+++ b/hgext/largefiles/overrides.py Thu May 08 16:54:23 2014 -0700
@@ -452,9 +452,9 @@
# 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):
+def overridefilemerge(origfn, repo, mynode, orig, fcd, fco, fca, labels=None):
if not lfutil.isstandin(orig):
- return origfn(repo, mynode, orig, fcd, fco, fca)
+ return origfn(repo, mynode, orig, fcd, fco, fca, labels=labels)
ahash = fca.data().strip().lower()
dhash = fcd.data().strip().lower()