codex-test/demo-ci-lab
1
0 Fork 0
Code Issues 1 Pull Requests 2 Packages Projects Releases 1 Wiki Activity

feat: 保留真实合并冲突

Browse Source
This commit is contained in:
codex-test committed 2026-10-12 15:23:43 +00:00
1 parent e30daf2a6a
commit 957c8419cb
1 file changed
+1 -1
Download Patch File Download Diff File Expand all files Collapse all files
config/conflict.txt
+1 -1
View File
@@ -1 +1 @@
baseline
feature selects fixture A