pre-commit/pre-commit-hooks
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit-hooks.git synced 2026-03-30 02:16:52 +00: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] 2025-12-20 05:33:34 +00:00
parent 19609da705
commit 04bf47cb9b
2 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pre_commit_hooks/check_merge_conflict.py
View file

@ -43,7 +43,7 @@ def main(argv: Sequence[str] | None = None) -> int:
for i, line in enumerate(inputfile, start=1):
# Look for conflict patterns in order
if line.startswith(
CONFLICT_PATTERNS[expected_conflict_pattern_index]
CONFLICT_PATTERNS[expected_conflict_pattern_index],
):
expected_conflict_pattern_index += 1
if expected_conflict_pattern_index == N: