hgext/largefiles/overrides.py
changeset 48431 6b1049d71c3e
parent 48390 322525db4c98
child 48432 f45a4a47f6a8
--- a/hgext/largefiles/overrides.py	Fri Dec 03 16:21:46 2021 -0800
+++ b/hgext/largefiles/overrides.py	Fri Dec 03 21:41:43 2021 -0800
@@ -668,12 +668,10 @@
 # largefiles. This will handle identical edits without prompting the user.
 @eh.wrapfunction(filemerge, b'_filemerge')
 def overridefilemerge(
-    origfn, premerge, repo, wctx, mynode, orig, fcd, fco, fca, labels=None
+    origfn, repo, wctx, mynode, orig, fcd, fco, fca, labels=None
 ):
     if not lfutil.isstandin(orig) or fcd.isabsent() or fco.isabsent():
-        return origfn(
-            premerge, repo, wctx, mynode, orig, fcd, fco, fca, labels=labels
-        )
+        return origfn(repo, wctx, mynode, orig, fcd, fco, fca, labels=labels)
 
     ahash = lfutil.readasstandin(fca).lower()
     dhash = lfutil.readasstandin(fcd).lower()