# HG changeset patch # User Martin von Zweigbergk # Date 1638597025 28800 # Node ID de8181c5414daea7b6c8bf2cfad33cf06da444e0 # Parent 9e1f174d305b51a9407937d9c21099edd1a2961f 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 diff -r 9e1f174d305b -r de8181c5414d tests/failfilemerge.py --- 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):