testdata: seed sandbox conflict base

roodboi · roodboi · commit e6058847cf38 · 2026-03-25T14:46:18.000-04:00
diff --git a/_test_data/sandbox/conflict/shared.txt b/_test_data/sandbox/conflict/shared.txt
@@ -0,0 +1,3 @@
+conflict scenario
+owner: sandbox-conflict-base
+resolution: parent branch version

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+conflict scenario`
	`2`	`+owner: sandbox-conflict-base`
	`3`	`+resolution: parent branch version`