ef4c38d8a7
feat: resolve conflicts through focused two-way drafts
...
Replace the marker-filled three-pane resolver with a marker-free native
Draft versus frozen Alternative projected from current working text.
Preserve preexisting outside edits, native undo, dirty-save guards, all
sides/bases, and draft caret/viewports across separate History views.
Reuse DiffState alignment/highlighting/excerpts for Resolution and merge
its base-aligned rows for readonly three-way History. Hide explorer and
source-selector chrome by default.
Verified 926 tests plus actual terminal projection, History highlighting,
hunk choice, optional explorer, and guarded jj-confirmed save workflows.
Clippy completes with pre-existing warnings only. Smoke fixtures stay
unresolved in this ancestry; remove that ancestry before publication.
Size exception: approximately 1650 implementation added/deleted lines,
excluding tests/docs, kept coherent because native draft lifecycle and
aligned rendering must change together without parallel legacy modes.
2026-10-14 17:01:45 +02:00
0000089f42
feat: stream newest pull requests by category
2026-10-14 14:26:22 +02:00
af6496bd5a
feat: browse GitHub GitLab and Gitea pull requests
2026-10-14 13:40:43 +02:00
hl-valdemar
11b31d2621
feat: dim whitespace markers and configure scope and newlines
2026-10-13 23:33:42 +02:00
hl-valdemar
99fa5a2aff
feat: track checkout identity for pinned diff editability
2026-10-13 17:28:59 +02:00
bfdb7c544f
feat: follow forward working-checkout changes in diffs
2026-10-13 13:49:10 +02:00
38fcf86195
feat: mark diff files as reviewed
2026-10-13 13:16:57 +02:00
5382307fcc
feat: rank fuzzy revision and reference searches in diff selectors
2026-10-13 12:20:00 +02:00
6c254f9b0d
feat: default diffs to branch changes
2026-10-13 10:48:24 +02:00
hl-valdemar
d1855dbdb7
feat: add configurable diff modes and split orientation
2026-10-13 08:45:43 +02:00
hl-valdemar
2260817fc0
feat: support macOS modified backspace deletion
2026-10-12 22:09:43 +02:00
1b8b669ca0
feat: preserve diff context during LSP navigation
2026-10-12 14:27:16 +02:00
7bc5eab22f
fix: preserve selector text input and close on escape
2026-10-12 13:33:41 +02:00
hl-valdemar
a80f97309b
feat: highlight character-level changes in diff panes
2026-10-11 20:14:17 +02:00
hl-valdemar
1f625a69c4
feat: add toggleable buffer word wrap
2026-10-11 16:19:58 +02:00
hl-valdemar
2e05725a38
perf: avoid eager diff loading and full-file typing work
2026-10-11 15:54:42 +02:00
hl-valdemar
7b4bc80538
fix: synchronize horizontal scrolling between diff panes
2026-10-11 15:06:05 +02:00
hl-valdemar
0d4601b612
feat: support horizontal mouse scrolling in buffers
2026-10-11 14:22:38 +02:00
hl-valdemar
5186714ef5
feat: enable native readonly diff interaction and synchronized pane cursors
2026-10-11 12:34:38 +02:00
hl-valdemar
fc960ea0bf
feat: show single-pane diffs for added deleted and renamed files
2026-10-11 11:23:29 +02:00
hl-valdemar
976cfc9e62
fix: target caret excerpts and retain diff viewport offsets
2026-10-11 11:00:13 +02:00
hl-valdemar
86d22d4fa2
fix: skip omitted diff lines instead of expanding excerpts during navigation
2026-10-11 03:17:21 +02:00
hl-valdemar
9a34669c08
feat: edit working-checkout comparisons with normal editor actions
2026-10-11 02:44:24 +02:00
hl-valdemar
704dce2539
feat: add expandable diff excerpts with configurable context
2026-10-11 01:49:40 +02:00
hl-valdemar
db5d417a17
feat: add syntax-aware diff backgrounds and diagonal gap shading
2026-10-11 01:26:56 +02:00
hl-valdemar
2f595ca4ca
feat: toggle diff explorer and show file change indicators
2026-10-11 01:03:52 +02:00
hl-valdemar
83c37f5a19
feat: reuse the docked file tree for diff navigation
2026-10-11 00:27:33 +02:00
hl-valdemar
81a2bf9a02
feat: add local and remote repository diff views
2026-10-11 00:08:58 +02:00
Valdemar Lorenzen
hl-valdemar