From 8993f104661f1cafc359da0fff3ddec91785ae42 Mon Sep 17 00:00:00 2001
From: Chris Keele <christhekeele@gmail.com>
Date: Sat, 10 Apr 2021 15:49:06 -0700
Subject: [PATCH] Check for diff3-style merge conflict artifacts.

---
 pre_commit_hooks/check_merge_conflict.py | 1 +
 1 file changed, 1 insertion(+)

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'>>>>>>> ',
 ]