Replace deprecated yield_fixture with fixture Committed via https://github.com/asottile/all-repos

diff --git a/tests/check_merge_conflict_test.py b/tests/check_merge_conflict_test.py
index a999aca..8a848ba 100644
--- a/tests/check_merge_conflict_test.py
+++ b/tests/check_merge_conflict_test.py

@@ -12,7 +12,7 @@
 from testing.util import write_file
 
 
-@pytest.yield_fixture
+@pytest.fixture
 def f1_is_a_conflict_file(tmpdir):
     # Make a merge conflict
     repo1 = tmpdir.join('repo1')
@@ -67,7 +67,7 @@
         yield
 
 
-@pytest.yield_fixture
+@pytest.fixture
 def repository_is_pending_merge(tmpdir):
     # Make a (non-conflicting) merge
     repo1 = tmpdir.join('repo1')

diff --git a/tests/conftest.py b/tests/conftest.py
index 87fec70..da206cb 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py

@@ -7,7 +7,7 @@
 from pre_commit_hooks.util import cmd_output
 
 
-@pytest.yield_fixture
+@pytest.fixture
 def temp_git_dir(tmpdir):
     git_dir = tmpdir.join('gits')
     cmd_output('git', 'init', '--', git_dir.strpath)

diff --git a/tests/forbid_new_submodules_test.py b/tests/forbid_new_submodules_test.py
index fb37862..dc64f06 100644
--- a/tests/forbid_new_submodules_test.py
+++ b/tests/forbid_new_submodules_test.py

@@ -6,7 +6,7 @@
 from pre_commit_hooks.forbid_new_submodules import main
 
 
-@pytest.yield_fixture
+@pytest.fixture
 def git_dir_with_git_dir(tmpdir):
     with tmpdir.as_cwd():
         cmd_output('git', 'init', '.')