Repository navigation
Commit 4008e2b
Merge main 0212cab (D1, PR 449) into the D3 branch
D3 (macOS Debug leaves the pull-request matrix) was written on the pre-merge D1
squash 14c3365; main's final D1 is textually identical to it in the four files
that conflicted (AGENTS.md, docs/ci.md, scripts/ci_preflight.py,
scripts/test_ci_preflight.py: git diff 14c3365 0212cab is empty for them),
so each conflict resolves to the D3 side. No D1 text is dropped; D3's own
rewritten sentences are named in the D3 commit message.
Co-Authored-By: Claude Sonnet 5.5 <[email protected]>3 files changed
Lines changed: 5 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
25 | | - | |
26 | | - | |
| 25 | + | |
| 26 | + | |
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
5 | | - | |
| 4 | + | |
| 5 | + | |
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| |||
0 commit comments