diff options
| author | Ryooooooga <eial5q265e5@gmail.com> | 2021-08-22 01:03:05 +0900 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2021-08-25 22:23:55 +1000 |
| commit | a0e7604f61f19f829f76966fb3f97cab09307ab1 (patch) | |
| tree | 36bde2f20620974664d4acee44a900bcf032b129 /pkg/gui/keybindings.go | |
| parent | aedeba4fe3bb38a7467dccc2cbe461d8d014dca0 (diff) | |
Support `git config merge.conflictStyle diff3`
Diffstat (limited to 'pkg/gui/keybindings.go')
| -rw-r--r-- | pkg/gui/keybindings.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkg/gui/keybindings.go b/pkg/gui/keybindings.go index 4d593dbd0..a74f3c68c 100644 --- a/pkg/gui/keybindings.go +++ b/pkg/gui/keybindings.go @@ -1485,14 +1485,14 @@ func (gui *Gui) GetInitialKeybindings() []*Binding { ViewName: "main", Contexts: []string{string(MAIN_MERGING_CONTEXT_KEY)}, Key: gui.getKey(config.Universal.PrevItem), - Handler: gui.handleSelectTop, + Handler: gui.handleSelectPrevConflictHunk, Description: gui.Tr.SelectTop, }, { ViewName: "main", Contexts: []string{string(MAIN_MERGING_CONTEXT_KEY)}, Key: gui.getKey(config.Universal.NextItem), - Handler: gui.handleSelectBottom, + Handler: gui.handleSelectNextConflictHunk, Description: gui.Tr.SelectBottom, }, { @@ -1500,14 +1500,14 @@ func (gui *Gui) GetInitialKeybindings() []*Binding { Contexts: []string{string(MAIN_MERGING_CONTEXT_KEY)}, Key: gocui.MouseWheelUp, Modifier: gocui.ModNone, - Handler: gui.handleSelectTop, + Handler: gui.handleSelectPrevConflictHunk, }, { ViewName: "main", Contexts: []string{string(MAIN_MERGING_CONTEXT_KEY)}, Key: gocui.MouseWheelDown, Modifier: gocui.ModNone, - Handler: gui.handleSelectBottom, + Handler: gui.handleSelectNextConflictHunk, }, { ViewName: "main", @@ -1528,14 +1528,14 @@ func (gui *Gui) GetInitialKeybindings() []*Binding { Contexts: []string{string(MAIN_MERGING_CONTEXT_KEY)}, Key: gui.getKey(config.Universal.PrevItemAlt), Modifier: gocui.ModNone, - Handler: gui.handleSelectTop, + Handler: gui.handleSelectPrevConflictHunk, }, { ViewName: "main", Contexts: []string{string(MAIN_MERGING_CONTEXT_KEY)}, Key: gui.getKey(config.Universal.NextItemAlt), Modifier: gocui.ModNone, - Handler: gui.handleSelectBottom, + Handler: gui.handleSelectNextConflictHunk, }, { ViewName: "main", |