Barrett Ruth 6e1a053bc4 feat(conflict): add virtual text formatting and action lines ... Problem: conflict resolution virtual text only showed plain "current" / "incoming" labels with no keymap hints, and users had no way to discover available keymaps without reading docs. Solution: add keymap hints to default labels ("current — doo"), expose format_virtual_text config for custom label formatting, and add show_actions option for codelens-style action lines above conflict markers. Also add hunk hints in merge diff views.		2026-02-09 13:05:37 -05:00
..
diffs.nvim.txt	feat(conflict): add virtual text formatting and action lines	2026-02-09 13:05:37 -05:00