commit e4819463f067a9400d0cf4d3f464084d2f8271e7
parent bbced06d6293d7bbed12a7a6926cf09e4af0dc6c
Author: I Mean I'm Just Saying <imeanimjustsaying@kiwifarms.st>
Date: Wed, 30 Sep 2026 20:36:48 -0400
plans: release 13 slice W3's record names the merge by its reworded sha (d9a43d20, the same tree as f7a047ee)
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Diffstat:
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/plans/release-13.md b/plans/release-13.md
@@ -532,7 +532,10 @@ Release 13's W slices were reviewed SHIP on 2026-09-28 and never merged. `main`
releases 14, 15 and 16 and the 0.11.0 cut. This brings the branch to today's `main` and proves it
again. It is a merge, not a rebase, so the reviewed commits keep their shas.
-**The merge:** `f7a047ee` merges `main` `7a77536b` (238 commits) into the branch tip `83ee15ef`.
+**The merge:** `abefa892` merges `main` `7a77536b` (238 commits) into the branch tip `83ee15ef`.
+It was first committed as `f7a047ee`, then reworded to this round's uniform commit trailer; the
+tree is the same (`git diff f7a047ee abefa892` is empty), so the gates below, run at `f7a047ee`,
+hold for it.
Git marked four content conflicts and no modify/delete conflict. Each was resolved by keeping both
sides.
