feat: 保留真实合并冲突

2026-10-12 15:23:43 +00:00
6 changed files with 1 additions and 9 deletions
@@ -1 +1 @@
-master selects fixture B
+feature selects fixture A
@@ -1 +0,0 @@
 {"demoEnabled":false}
@@ -1,2 +0,0 @@
 # Demo change 1
 Round 1
@@ -1,2 +0,0 @@
 # Demo change 2
 Round 1
@@ -1,2 +0,0 @@
 # Demo change 3
 Round 1
@@ -1 +0,0 @@
 # Obsolete demo file
		`@@ -1 +1 @@`
			`master selects fixture B`				`feature selects fixture A`