Mercurial > hg
changeset 48426:de8181c5414d
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
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 03 Dec 2021 21:50:25 -0800 |
| parents | 9e1f174d305b |
| children | 38941a28406a |
| files | tests/failfilemerge.py |
| diffstat | 1 files changed, 1 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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):