[Updated] D11854: tests: remove unnecessary explicit args from `failfilemerge.py`

[martinvonz (Martin von Zweigbergk)]

Closed by commit rHGde8181c5414d: tests: remove unnecessary explicit args from `failfilemerge.py` (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D11854?vs=31306&id=31378

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D11854/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D11854

AFFECTED FILES
  tests/failfilemerge.py

CHANGE DETAILS

diff --git a/tests/failfilemerge.py b/tests/failfilemerge.py
--- a/tests/failfilemerge.py
+++ b/tests/failfilemerge.py
@@ -9,11 +9,8 @@
 )
 
 
-def failfilemerge(
-    filemergefn, premerge, repo, wctx, mynode, orig, fcd, fco, fca, labels=None
-):
+def failfilemerge(*args, **kwargs):
     raise error.Abort(b"^C")
-    return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels)
 
 
 def extsetup(ui):



To: martinvonz, #hg-reviewers, Alphare
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20211208/7ab3f836/attachment-0002.html>