diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2022-01-26 01:20:19 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-01-26 14:50:47 +1100 |
| commit | c8cc18920f0b5ab54a19b9f7bdcf83db3210576f (patch) | |
| tree | 60623fbe5504469b9a4f4ca25a9a538b4eee52ce /pkg/gui/keybindings.go | |
| parent | ce3bcfe37cf0c68f501fb09d543e9e212b0eaa61 (diff) | |
improve merge conflict flow
Diffstat (limited to 'pkg/gui/keybindings.go')
| -rw-r--r-- | pkg/gui/keybindings.go | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/pkg/gui/keybindings.go b/pkg/gui/keybindings.go index 584a276bb..464bb4f5d 100644 --- a/pkg/gui/keybindings.go +++ b/pkg/gui/keybindings.go @@ -1543,20 +1543,6 @@ func (gui *Gui) GetInitialKeybindings() []*Binding { { ViewName: "main", Contexts: []string{string(MAIN_MERGING_CONTEXT_KEY)}, - Key: gocui.MouseWheelUp, - Modifier: gocui.ModNone, - Handler: gui.handleSelectPrevConflictHunk, - }, - { - ViewName: "main", - Contexts: []string{string(MAIN_MERGING_CONTEXT_KEY)}, - Key: gocui.MouseWheelDown, - Modifier: gocui.ModNone, - Handler: gui.handleSelectNextConflictHunk, - }, - { - ViewName: "main", - Contexts: []string{string(MAIN_MERGING_CONTEXT_KEY)}, Key: gui.getKey(config.Universal.PrevBlockAlt), Modifier: gocui.ModNone, Handler: gui.handleSelectPrevConflict, @@ -1586,7 +1572,7 @@ func (gui *Gui) GetInitialKeybindings() []*Binding { ViewName: "main", Contexts: []string{string(MAIN_MERGING_CONTEXT_KEY)}, Key: gui.getKey(config.Universal.Undo), - Handler: gui.handlePopFileSnapshot, + Handler: gui.handleMergeConflictUndo, Description: gui.Tr.LcUndo, }, { |