Skip to content

Commit 0339391

Browse files
author
Stack Demo
committed
testdata: seed sandbox overlap child
1 parent b9b5c29 commit 0339391

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

_test_data/sandbox/overlap/shared.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ Parent branch owns this section and introduces the file.
66

77
## Section B
88

9-
This section will be edited by the child branch.
9+
Child branch rewrites this section to create same-file stacked diffs without a guaranteed merge conflict.
1010

11-
Marker: 74d5552
11+
Marker: b9b5c29

0 commit comments

Comments
 (0)