pre-commit/pre-commit-hooks
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit-hooks.git synced 2026-04-05 19:46:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add negative test cases for various git artifacts.

Browse source
This commit is contained in:
Chris Keele 2021-04-11 02:44:34 -07:00
parent 8993f10466
commit 0c6a81a69f
2 changed files with 26 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
pre_commit_hooks/check_merge_conflict.py
View file

@ -7,8 +7,9 @@ from typing import Sequence
CONFLICT_PATTERNS = [
b'<<<<<<< ',
b'======= ',
b'||||||| ',
b'=======\n',
b'||||||| ',
b'|||||||\n',
b'>>>>>>> ',
]