From 41b384d52e3bf14a617d0e9e0bb005bb241ea4cb Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed, 11 Mar 2026 18:06:52 +1000
Subject: [PATCH] pre-commit: check for merge conflicts too

Part-of: <https://gitlab.freedesktop.org/libinput/libinput/-/merge_requests/1480>
---
 .pre-commit-config.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 6f804c41..edfe8836 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -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