diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-07-17 07:38:15 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-07-17 07:38:15 +0000 |
| commit | d7666fa97c8bbaced14dadba189f0d5064d67821 (patch) | |
| tree | b67672fefc0275e3ac26e2deed8b87e17ee6cd5c /tests/conftest.py | |
| parent | Releasing debian version 2.12.1-1. (diff) | |
| download | pre-commit-d7666fa97c8bbaced14dadba189f0d5064d67821.tar.xz pre-commit-d7666fa97c8bbaced14dadba189f0d5064d67821.zip | |
Merging upstream version 2.13.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'tests/conftest.py')
| -rw-r--r-- | tests/conftest.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/conftest.py b/tests/conftest.py index b36ce5a..f38f969 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -90,8 +90,8 @@ def _make_conflict(): @pytest.fixture def in_merge_conflict(tempdir_factory): path = make_consuming_repo(tempdir_factory, 'script_hooks_repo') - open(os.path.join(path, 'dummy'), 'a').close() - cmd_output('git', 'add', 'dummy', cwd=path) + open(os.path.join(path, 'placeholder'), 'a').close() + cmd_output('git', 'add', 'placeholder', cwd=path) git_commit(msg=in_merge_conflict.__name__, cwd=path) conflict_path = tempdir_factory.get() |