pre-commit: check for merge conflicts too

Part-of: <https://gitlab.freedesktop.org/libinput/libinput/-/merge_requests/1480>
This commit is contained in:
Peter Hutterer 2026-03-11 18:06:52 +10:00
parent 61b3b785ae
commit 41b384d52e

View file

@ -4,6 +4,7 @@ repos:
hooks:
- id: end-of-file-fixer
- id: trailing-whitespace
- id: check-merge-conflict
- id: no-commit-to-branch
args: ['--branch', 'main']
- repo: https://github.com/astral-sh/ruff-pre-commit