diff options
| author | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-01-25 01:50:03 +0100 |
|---|---|---|
| committer | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-01-25 01:50:03 +0100 |
| commit | 686c39f7a8870056dfa9bfa32867a525c5f9576a (patch) | |
| tree | 8664384f2eb2b5618164e2e8d47456dba1b1fb07 /.pre-commit-config.yaml | |
| parent | 65c62a42ac3d27e62ee2bf2eb03bfb4705dd246c (diff) | |
pre-commit: Enable check-merge-conflict hook
Diffstat (limited to '.pre-commit-config.yaml')
| -rw-r--r-- | .pre-commit-config.yaml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3f5459f593..2bad00fe2b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -4,6 +4,7 @@ repos: hooks: - id: check-case-conflict - id: check-byte-order-marker + - id: check-merge-conflict - id: check-yaml - id: check-json - id: check-xml |