diff options
| author | Ryooooooga <eial5q265e5@gmail.com> | 2022-04-04 21:12:33 +0900 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-04-06 08:27:03 +1000 |
| commit | 3b5a019e1a33bbb9b331d44956f98b2b8c4cd5a9 (patch) | |
| tree | 8b4c129d57124441edee6a1d7d6734796498d1b6 /pkg/gui/keybindings.go | |
| parent | 53257db99d10bd533c134714b76965041c56cd19 (diff) | |
feat(merge_panel): Add open/edit files in merge conflict panel
Diffstat (limited to 'pkg/gui/keybindings.go')
| -rw-r--r-- | pkg/gui/keybindings.go | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/pkg/gui/keybindings.go b/pkg/gui/keybindings.go index 7a2d5f757..8598502ef 100644 --- a/pkg/gui/keybindings.go +++ b/pkg/gui/keybindings.go @@ -674,6 +674,20 @@ func (self *Gui) GetInitialKeybindings() ([]*types.Binding, []*gocui.ViewMouseBi { ViewName: "main", Contexts: []string{string(context.MAIN_MERGING_CONTEXT_KEY)}, + Key: opts.GetKey(opts.Config.Universal.Edit), + Handler: self.handleMergeConflictEditFileAtLine, + Description: self.c.Tr.LcEditFile, + }, + { + ViewName: "main", + Contexts: []string{string(context.MAIN_MERGING_CONTEXT_KEY)}, + Key: opts.GetKey(opts.Config.Universal.OpenFile), + Handler: self.handleMergeConflictOpenFileAtLine, + Description: self.c.Tr.LcOpenFile, + }, + { + ViewName: "main", + Contexts: []string{string(context.MAIN_MERGING_CONTEXT_KEY)}, Key: opts.GetKey(opts.Config.Universal.Undo), Handler: self.handleMergeConflictUndo, Description: self.c.Tr.LcUndo, |