fix: format

Author: ritvi-alagusankar

src/_pytest/_io/pprint.py

@@ -62,11 +62,7 @@ def __init__(
         indent: int = 4,
         width: int = 80,
         depth: int | None = None,
-<<<<<<< HEAD
         sort_dicts: bool = False,
-=======
-        sort_dicts: bool = True,
->>>>>>> 004825824a612277d452488b01af76ce33bb85d9
     ) -> None:
         """Handle pretty printing operations onto a stream using a set of
         configured parameters.
@@ -79,6 +75,9 @@ def __init__(
 
         depth
             The maximum depth to print out nested structures.
+        
+        sort_dicts
+            If true, dict keys are sorted.
 
         sort_dicts
             If true, dict keys are sorted.
@@ -94,6 +93,7 @@ def __init__(
         self._indent_per_level = indent
         self._width = width
         self._sort_dicts = sort_dicts
+        self._sort_dicts = sort_dicts
 
     def pformat(self, object: Any) -> str:
         sio = _StringIO()
@@ -171,6 +171,10 @@ def _pprint_dict(
     ) -> None:
         write = stream.write
         write("{")
+        if self._sort_dicts:
+            items = sorted(object.items(), key=_safe_tuple)
+        else:
+            items = object.items()
         if self._sort_dicts:
             items = sorted(object.items(), key=_safe_tuple)
         else:
@@ -620,6 +624,11 @@ def _safe_repr(
             components: list[str] = []
             append = components.append
             level += 1
+            if self._sort_dicts:
+                items = sorted(object.items(), key=_safe_tuple)
+            else:
+                items = object.items()
+            for k, v in items:
             if self._sort_dicts:
                 items = sorted(object.items(), key=_safe_tuple)
             else: