third-party/pre-commit
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit.git synced 2026-02-17 00:04:42 +04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use more inclusive language

Browse source 
Committed via https://github.com/asottile/all-repos
This commit is contained in:
Anthony Sottile 2021-05-14 19:11:05 -07:00
parent 2c28197c2a
commit 3922263f8c
11 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/conftest.py
View file

@ -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()