diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-01-04 07:22:22 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-01-04 07:22:28 +0000 |
| commit | 2e8bfde15d76ad56da2d1bbd99294dafd4e4372f (patch) | |
| tree | 8baa02378416532628cbe6a7c3790954a7953dfd /tests/conftest.py | |
| parent | Releasing debian version 2.20.0-2. (diff) | |
| download | pre-commit-2e8bfde15d76ad56da2d1bbd99294dafd4e4372f.tar.xz pre-commit-2e8bfde15d76ad56da2d1bbd99294dafd4e4372f.zip | |
Merging upstream version 2.21.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'tests/conftest.py')
| -rw-r--r-- | tests/conftest.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/conftest.py b/tests/conftest.py index 40c0c05..3076171 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -68,7 +68,7 @@ def _make_conflict(): bar_only_file.write('bar') cmd_output('git', 'add', 'bar_only_file') git_commit(msg=_make_conflict.__name__) - cmd_output('git', 'merge', 'foo', retcode=None) + cmd_output('git', 'merge', 'foo', check=False) @pytest.fixture |