sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-30 03:23:08 +03:00
Code Activity

Support git config merge.conflictStyle diff3

Browse Source
This commit is contained in:
Ryooooooga
2021-08-22 01:03:05 +09:00
committed by Jesse Duffield
parent aedeba4fe3
commit a0e7604f61
7 changed files with 140 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/gui/keybindings.go
View File

@ -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",