James Peter 31ac20b0e7 Merge upstream/main into merge/upstream-20250825 preferring ours (-X ours)

2025-08-25 20:50:54 +10:00

..

src

Diff wrapping: add one extra space to continuation hang indent\n\n- Continuation lines now reserve sign column + trailing space before content\n- Aligns wrapped rows exactly under the first-line content

2025-08-25 11:01:04 +10:00

tests

test: faster test execution in codex-core (#2633)

2025-08-24 11:10:53 -07:00

Cargo.toml

Merge upstream/main; align protocol/core; revert TUI to fork and adapt; fix build

2025-08-23 18:13:52 +10:00