mirror of
https://github.com/pre-commit/pre-commit.git
synced 2026-02-19 09:04:41 +04:00
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
This commit is contained in:
parent
54485588e5
commit
8437b6703d
1 changed files with 1 additions and 1 deletions
|
|
@ -571,7 +571,7 @@ def test_merge_conflict_modified(cap_out, store, in_merge_conflict):
|
||||||
|
|
||||||
|
|
||||||
def test_merge_conflict_modified_post_checkout(
|
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
|
# Touch another file so we have unstaged non-conflicting things
|
||||||
assert os.path.exists('placeholder')
|
assert os.path.exists('placeholder')
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue