Check for diff3-style merge conflict artifacts.

christhekeele · christhekeele · commit 8993f104661f · 2021-04-10T15:49:06.000-07:00
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'>>>>>>> ',
 ]
