From 1c14651c35934bc19717ded7bf9d74b52f6de19e Mon Sep 17 00:00:00 2001 From: Dimitri Kennedy Date: Thu, 26 Mar 2026 14:28:30 -0400 Subject: [PATCH] testdata: seed sandbox overlap child --- _test_data/sandbox/overlap/shared.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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