Valdemar Lorenzen 168e12160a refactor: route conflict resolution through the diff workspace ...

Use the active DiffState, native FilePicker and existing diff input,
layout, focus, source navigation and scrolling paths for Resolution.
Delete separate resolver filtering, file-list rendering and scroll APIs.
Keep projections, source choices, History and guarded jj saves distinct.

Verify native parity for picker remaps, current-file selection, excerpt
initialization, folded search, wheel focus, layouts, buffer transitions
and per-file viewports. All 932 tests pass; actual terminal smoke covers
Space-e explorer, Down/Enter file selection and guarded confirmed save.
Clippy completes with existing warnings only.

Size exception: 1197 implementation added/deleted lines excluding tests
and docs; input routing, native buffer lifecycle and rendering are kept
as one coherent cutover, without a parallel legacy resolver path.

2026-10-15 10:21:10 +02:00

..

commands.rs

fix: retain alternate screen across executable restart

2026-10-12 23:40:51 +02:00

diff_search.rs

feat: rank fuzzy revision and reference searches in diff selectors

2026-10-13 12:20:00 +02:00

diff.rs

feat: track checkout identity for pinned diff editability

2026-10-13 17:28:59 +02:00

line_jump.rs

feat: jump to a line with counted g

2026-10-13 13:32:42 +02:00

line_yank.rs

fix: yank whole lines with yy and preserve paste shape

2026-10-13 13:04:48 +02:00

lsp.rs

feat: track checkout identity for pinned diff editability

2026-10-13 17:28:59 +02:00

navigation.rs

feat: track checkout identity for pinned diff editability

2026-10-13 17:28:59 +02:00

normal_editing.rs

fix: replace selected characters with visual r

2026-10-14 00:09:42 +02:00

paste_shapes.rs

fix: replace selected ranges instead of ignoring visual paste

2026-10-14 13:13:01 +02:00

repository.rs

fix: preserve lazy snapshots for conflicted jj revisions

2026-10-14 15:49:26 +02:00

resolve.rs

refactor: route conflict resolution through the diff workspace

2026-10-15 10:21:10 +02:00