From 957c8419cb3adac741b90f560c394bfe5056fd2f Mon Sep 17 00:00:00 2001
From: codex-test <codex-test@example.invalid>
Date: Mon, 12 Oct 2026 15:23:43 +0000
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=9D=E7=95=99=E7=9C=9F=E5=AE=9E?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/conflict.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/conflict.txt b/config/conflict.txt
index 180b47c..d0a567f 100644
--- a/config/conflict.txt
+++ b/config/conflict.txt
@@ -1 +1 @@
-baseline
+feature selects fixture A
-- 
2.54.0