Skip to content

Commit 95def43

Browse files
author
Stack Demo
committed
testdata: seed sandbox conflict child
1 parent 0d98d52 commit 95def43

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

‎_test_data/sandbox/conflict/shared.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
conflict scenario
2-
owner: sandbox-conflict-base
3-
resolution: parent branch version
4-
marker: 74d5552
2+
owner: sandbox-conflict-child
3+
resolution: child branch version
4+
marker: 0d98d52

0 commit comments

Comments
 (0)