Check for diff3-style merge conflict artifacts.

pre-commit · Apr 10, 2021 · 8993f10 · 8993f10
1 parent 2f7e22d
commit 8993f10
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/pre_commit_hooks/check_merge_conflict.py b/pre_commit_hooks/check_merge_conflict.py
@@ -7,6 +7,7 @@
 CONFLICT_PATTERNS = [
     b'<<<<<<< ',
     b'======= ',
+    b'||||||| ',
     b'=======\n',
     b'>>>>>>> ',
 ]