Levi Neuwirth
12e2cff466
`docs/active-work.md` was the only conflicting file. #196 added the dired Stage 2a lane at the position this branch had used to relabel the #188 framing lane header; the resolution keeps both, changing neither side's wording. `src/editor_core.rs` auto-merged. Both lanes touch it, so a clean textual merge is not evidence of a clean semantic one — the gate suite is re-run in full on the merged tree rather than inherited from the pre-merge head. Resolution verified for line loss in both directions: the resolved file differs from `main` only by this branch's own authored edits, and differs from this branch only by additions taken from `main`. |
||
|---|---|---|
| .. | ||
| api | ||
| commands | ||
| hooks | ||
| keymaps | ||
| menus | ||
| packages/repl | ||
| queries/latex | ||
| runtime | ||