conflict support 8 - condense result winbar op legend into dedicated help panel for conflict panels

README.md

@@ -242,6 +242,7 @@ Available top-level config domains:
 - `windows`
 - `filetree`
 - `log`
+- `merge`
 - `keymaps`
 - `pane_navigation`
 - `hunk_navigation`
@@ -261,6 +262,7 @@ Notes:
 - `theme.preset` selects a built-in palette, and `theme.palette` can override individual colors on top of that preset.
 - `welcome.animate` controls whether the welcome screen animation runs.
 - `watch.enabled` keeps `.git` metadata watchers on. `watch.poll` controls background worktree polling for new untracked/external file changes.
+- `merge.keymaps.show_help` controls the merge actions help key. It defaults to `?`.
 - Discard actions always prompt for confirmation before changing the repo state.
 
 </details>

lua/glance/config.lua

@@ -92,6 +92,7 @@ local ALLOWED_MERGE = {
 }
 
 local ALLOWED_MERGE_KEYMAPS = {
+  show_help = true,
   accept_ours = true,
   accept_theirs = true,
   accept_both_ours_then_theirs = true,
@@ -107,6 +108,7 @@ local ALLOWED_MERGE_KEYMAPS = {
 }
 
 local MERGE_KEYMAP_ORDER = {
+  'show_help',
   'accept_ours',
   'accept_theirs',
   'accept_both_ours_then_theirs',
@@ -260,6 +262,7 @@ local BASE_DEFAULTS = {
   },
   merge = {
     keymaps = {
+      show_help = '?',
       accept_ours = '<leader>o',
       accept_theirs = '<leader>t',
       accept_both_ours_then_theirs = '<leader>O',