tests: remove unnecessary explicit args from `failfilemerge.py`
The `failfilemerge()` function always raises an exception without
looking at its arguments, so let's use `*args` and `**kwargs`.
Differential Revision: https://phab.mercurial-scm.org/D11854
--- a/tests/failfilemerge.py Mon Nov 29 23:00:29 2021 -0800
+++ b/tests/failfilemerge.py Fri Dec 03 21:50:25 2021 -0800
@@ -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):