Barrett Ruth b5d28e9f2b feat(conflict): add virtual text formatting and action lines (#101) ... ## Problem Conflict resolution virtual text only showed plain "current" / "incoming" labels with no keymap hints. Users had no way to discover available resolution keymaps without reading docs. ## Solution Default virtual text labels now include keymap hints: `(current — doo)` and `(incoming — dot)`. A new `format_virtual_text` config option lets users customize or hide labels entirely. A new `show_actions` option (off by default) renders a codelens-style action line above each `<<<<<<<` marker listing all enabled resolution keymaps. Merge diff views also gain hunk hints on `@@` header lines showing available keymaps. New config fields: `conflict.format_virtual_text` (function|nil), `conflict.show_actions` (boolean). New highlight group: `DiffsConflictActions`.		2026-02-09 13:55:13 -05:00
..
diffs.nvim.txt	feat(conflict): add virtual text formatting and action lines (#101)	2026-02-09 13:55:13 -05:00