Formatting

benedikt-schesch · Jun 8, 2024 · fee943f · fee943f
1 parent 570415d
commit fee943f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/python/replay_merge.py b/src/python/replay_merge.py
@@ -262,8 +262,8 @@ def merge_replay(
                     stdout=subprocess.PIPE,
                 ).stdout.decode("utf-8")
                 is_conflict = len(conflict_files) > 0
-                assert is_conflict == (
-                    merge_result == MERGE_STATE.Merge_failed
+                assert (
+                    is_conflict == (merge_result == MERGE_STATE.Merge_failed)
                 ), f"merge_replay: tool{merge_tool} merge_result {merge_result} does not match conflict_files {conflict_files} at path {repo.local_repo_path}"
 
             result_df.loc[