summaryrefslogtreecommitdiffstats
path: root/pkg/gui/controllers/helpers/merge_and_rebase_helper.go
diff options
context:
space:
mode:
Diffstat (limited to 'pkg/gui/controllers/helpers/merge_and_rebase_helper.go')
-rw-r--r--pkg/gui/controllers/helpers/merge_and_rebase_helper.go1
1 files changed, 0 insertions, 1 deletions
diff --git a/pkg/gui/controllers/helpers/merge_and_rebase_helper.go b/pkg/gui/controllers/helpers/merge_and_rebase_helper.go
index de34f2193..2b94dfa7a 100644
--- a/pkg/gui/controllers/helpers/merge_and_rebase_helper.go
+++ b/pkg/gui/controllers/helpers/merge_and_rebase_helper.go
@@ -169,7 +169,6 @@ func (self *MergeAndRebaseHelper) PromptForConflictHandling() error {
OnPress: func() error {
return self.c.PushContext(self.c.Contexts().Files)
},
- Key: 'v',
},
{
Label: fmt.Sprintf(self.c.Tr.AbortMenuItem, mode),