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

[pre-commit.ci] auto fixes from pre-commit.com hooks

Browse source 
for more information, see https://pre-commit.ci
This commit is contained in:
pre-commit-ci[bot] 2024-12-23 17:28:31 +00:00
parent 54485588e5
commit 8437b6703d
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/commands/run_test.py
View file

@ -571,7 +571,7 @@ def test_merge_conflict_modified(cap_out, store, in_merge_conflict):
def test_merge_conflict_modified_post_checkout(
cap_out, store, in_merge_conflict
cap_out, store, in_merge_conflict,
):
# Touch another file so we have unstaged non-conflicting things
assert os.path.exists('placeholder')