diff options
| author | Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> | 2024-03-26 14:09:09 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-26 14:09:09 (GMT) |
| commit | 743f2c68f478279e1e56577fe95a0ed112b9abc5 (patch) | |
| tree | e1f6d899fff7e9d81a8133bf3952f913a766bc7e /.pre-commit-config.yaml | |
| parent | 4abca7e1e7e2764faf20c7e677ea5c9ea9dbffe2 (diff) | |
| download | cpython-743f2c68f478279e1e56577fe95a0ed112b9abc5.zip cpython-743f2c68f478279e1e56577fe95a0ed112b9abc5.tar.gz cpython-743f2c68f478279e1e56577fe95a0ed112b9abc5.tar.bz2 | |
pre-commit: add `check-case-conflict` and `check-merge-conflict` (#117259)
Diffstat (limited to '.pre-commit-config.yaml')
| -rw-r--r-- | .pre-commit-config.yaml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 69d8523..663a118 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.2.0 + rev: v0.3.4 hooks: - id: ruff name: Run Ruff on Lib/test/ @@ -14,6 +14,8 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks rev: v4.5.0 hooks: + - id: check-case-conflict + - id: check-merge-conflict - id: check-toml exclude: ^Lib/test/test_tomllib/ - id: check-yaml |