Merge branch 'refactor-test-discovery' of https://github.com/elazarg/mypy into refactor-test-discovery

Conflicts:
	mypy/test/data.py

Author: elazarg

mypy/test/data.py

@@ -573,8 +573,11 @@ class DataSuite:
     base_path = '.'  # type: typing.ClassVar[str]
     optional_out = False  # type: typing.ClassVar[bool]
     native_sep = False  # type: typing.ClassVar[bool]
+<<<<<<< HEAD
     require_stable = False  # type: typing.ClassVar[bool]
     require_incremental = False  # type: typing.ClassVar[bool]
+=======
+>>>>>>> c408b1491c21b632d65ece6da03a6236dd994218
 
     def __init__(self, *, update_data: bool) -> None:
         self.update_data = update_data