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

Check for diff3-style merge conflict artifacts.

Browse source
This commit is contained in:
Chris Keele 2021-04-10 15:49:06 -07:00
parent 2f7e22dc21
commit 8993f10466
1 changed files with 1 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
pre_commit_hooks/check_merge_conflict.py
View file

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