Skip to content

Commit 7a460a7

Browse files
roodboiroodboi
committed
testdata: seed sandbox trunk drift
1 parent be6ac97 commit 7a460a7

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

‎_test_data/sandbox/conflict/shared.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
conflict scenario
2+
owner: sandbox-trunk-drift
3+
resolution: trunk drift version
4+
marker: be6ac97

0 commit comments

Comments
 (0)