[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Author: pre-commit-ci[bot]

tests/check_merge_conflict_test.py

@@ -113,15 +113,16 @@ def test_merge_conflicts_git(capsys):
     # Individual markers are not actually merge conflicts, need 3 markers
     # to mark a real conflict
     'contents, expected_retcode',
-    ((b'<<<<<<< ', 0),
-     (b'=======', 0),
-     (b'>>>>>>> ',0),
-     # Real conflict marker
-     (b'<<<<<<< HEAD\n=======\n>>>>>>> branch\n', 1),
-     # Allow for the possibility of an .rst file with a =======
-     # inside a conflict marker
-     (b'<<<<<<< HEAD\n=======\n=======\n>>>>>>> branch\n', 1),
-    )
+    (
+        (b'<<<<<<< ', 0),
+        (b'=======', 0),
+        (b'>>>>>>> ', 0),
+        # Real conflict marker
+        (b'<<<<<<< HEAD\n=======\n>>>>>>> branch\n', 1),
+        # Allow for the possibility of an .rst file with a =======
+        # inside a conflict marker
+        (b'<<<<<<< HEAD\n=======\n=======\n>>>>>>> branch\n', 1),
+    ),
 )
 def test_merge_conflicts_with_rst(contents, expected_retcode, repository_pending_merge):
     repository_pending_merge.join('f2.rst').write_binary(contents)
@@ -147,14 +148,15 @@ def test_does_not_care_when_not_in_a_merge(tmpdir):
     f.write_binary(b'problem\n=======\n')
     assert main([str(f.realpath())]) == 0
 
+
 @pytest.mark.parametrize(
     'contents, expected_retcode',
     (
         # Not a complete conflict marker
         (b'=======', 0),
         # Complete conflict marker
         (b'<<<<<<< HEAD\nproblem\n=======\n>>>>>>> branch\n', 1),
-    )
+    ),
 )
 def test_care_when_assumed_merge(contents, expected_retcode, tmpdir):
     f = tmpdir.join('README.md')