mirror of
https://gitlab.com/etherlab.org/ethercat.git
synced 2026-08-17 00:40:48 +08:00
Always check for conflict markers.
This commit is contained in:
@@ -9,6 +9,7 @@ repos:
|
|||||||
- id: trailing-whitespace
|
- id: trailing-whitespace
|
||||||
- id: check-case-conflict
|
- id: check-case-conflict
|
||||||
- id: check-merge-conflict
|
- id: check-merge-conflict
|
||||||
|
args: [--assume-in-merge]
|
||||||
- id: check-symlinks
|
- id: check-symlinks
|
||||||
- id: fix-byte-order-marker
|
- id: fix-byte-order-marker
|
||||||
- id: mixed-line-ending
|
- id: mixed-line-ending
|
||||||
|
|||||||
Reference in New Issue
Block a user