diff --git a/_test_data/sandbox/overlap/shared.md b/_test_data/sandbox/overlap/shared.md index 5e633f6..fc63e0c 100644 --- a/_test_data/sandbox/overlap/shared.md +++ b/_test_data/sandbox/overlap/shared.md @@ -6,6 +6,6 @@ Parent branch owns this section and introduces the file. ## Section B -This section will be edited by the child branch. +Child branch rewrites this section to create same-file stacked diffs without a guaranteed merge conflict. -Marker: 00e3fde +Marker: 17a0f9c