Skip to content

Commit 59a4ec2

Browse files
roodboiroodboi
committed
testdata: seed sandbox conflict base
1 parent 7356d2e commit 59a4ec2

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

‎_test_data/sandbox/conflict/shared.txt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
conflict scenario
2-
owner: sandbox-trunk-drift
3-
resolution: trunk drift version
4-
marker: 44caee2
2+
owner: sandbox-conflict-base
3+
resolution: parent branch version

0 commit comments

Comments
 (0)