Add negative test cases for various git artifacts.

Author: christhekeele

Diff for: pre_commit_hooks/check_merge_conflict.py

@@ -7,8 +7,9 @@
 CONFLICT_PATTERNS = [
     b'<<<<<<< ',
     b'======= ',
-    b'||||||| ',
     b'=======\n',
+    b'||||||| ',
+    b'|||||||\n',
     b'>>>>>>> ',
 ]
 

Diff for: tests/check_merge_conflict_test.py

@@ -129,8 +129,32 @@ def test_does_not_care_when_not_in_a_merge(tmpdir):
     f.write_binary(b'problem\n=======\n')
     assert main([str(f.realpath())]) == 0
 
+    f = tmpdir.join('README.md')
+    f.write_binary(b'problem\n======= \n')
+    assert main([str(f.realpath())]) == 0
+
+    f = tmpdir.join('README.md')
+    f.write_binary(b'problem\n|||||||\n')
+    assert main([str(f.realpath()), '--assume-in-merge']) == 0
+
+    f = tmpdir.join('README.md')
+    f.write_binary(b'problem\n||||||| \n')
+    assert main([str(f.realpath()), '--assume-in-merge']) == 0
+
 
 def test_care_when_assumed_merge(tmpdir):
     f = tmpdir.join('README.md')
     f.write_binary(b'problem\n=======\n')
     assert main([str(f.realpath()), '--assume-in-merge']) == 1
+
+    f = tmpdir.join('README.md')
+    f.write_binary(b'problem\n======= \n')
+    assert main([str(f.realpath()), '--assume-in-merge']) == 1
+
+    f = tmpdir.join('README.md')
+    f.write_binary(b'problem\n|||||||\n')
+    assert main([str(f.realpath()), '--assume-in-merge']) == 1
+
+    f = tmpdir.join('README.md')
+    f.write_binary(b'problem\n||||||| \n')
+    assert main([str(f.realpath()), '--assume-in-merge']) == 1