From 8437b6703df240e8c4161fefef0ed20848585cf8 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 23 Dec 2024 17:28:31 +0000
Subject: [PATCH] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 tests/commands/run_test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/commands/run_test.py b/tests/commands/run_test.py
index 22034ea2..4b496fbc 100644
--- a/tests/commands/run_test.py
+++ b/tests/commands/run_test.py
@@ -571,7 +571,7 @@ def test_merge_conflict_modified(cap_out, store, in_merge_conflict):
 
 
 def test_merge_conflict_modified_post_checkout(
-    cap_out, store, in_merge_conflict
+    cap_out, store, in_merge_conflict,
 ):
     # Touch another file so we have unstaged non-conflicting things
     assert os.path.exists('placeholder')