#1642 Resolve conflicts

changelog/2976.trivial

@@ -1 +0,0 @@
-Change parametrized automatic test id generation to use the ``__name__`` attribute of functions instead of the fallback argument name plus counter.

changelog/3016.bugfix

@@ -1,2 +0,0 @@
-Fixed restoring Python state after in-process pytest runs with the ``pytester`` plugin; this may break tests using
-making multiple inprocess pytest runs if later ones depend on earlier ones leaking global interpreter changes.

changelog/3038.feature

@@ -1 +0,0 @@
-Console output fallsback to "classic" mode when capture is disabled (``-s``), otherwise the output gets garbled to the point of being useless.

changelog/3074.bugfix

@@ -1 +0,0 @@
-Fix skipping plugin reporting hook when test aborted before plugin setup hook.

changelog/3076.doc

@@ -1 +0,0 @@
-Fix the wording of a sentence on doctest flags use in pytest.

changelog/3088.bugfix

@@ -1 +0,0 @@
-Fix progress percentage reported when tests fail during teardown.

changelog/3092.doc

@@ -1 +0,0 @@
-Prefer ``https://*.readthedocs.io`` over ``http://*.rtfd.org`` for links in the documentation.

changelog/3101.feature

@@ -1,3 +0,0 @@
-New `pytest_runtest_logfinish <https://docs.pytest.org/en/latest/writing_plugins.html#_pytest.hookspec.pytest_runtest_logfinish>`_
-hook which is called when a test item has finished executing, analogous to
-`pytest_runtest_logstart <https://docs.pytest.org/en/latest/writing_plugins.html#_pytest.hookspec.pytest_runtest_start>`_.