diff --git a/pre_commit_hooks/check_merge_conflict.py b/pre_commit_hooks/check_merge_conflict.py index c20a8af..2e52e06 100644 --- a/pre_commit_hooks/check_merge_conflict.py +++ b/pre_commit_hooks/check_merge_conflict.py @@ -7,6 +7,7 @@ from typing import Sequence CONFLICT_PATTERNS = [ b'<<<<<<< ', b'======= ', + b'||||||| ', b'=======\n', b'>>>>>>> ', ]