go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-11-29 22:48:24 +02:00
Code Issues Releases 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

10
pkg/gui/merge_panel.go
View File

@@ -14,18 +14,18 @@ import (
"github.com/jesseduffield/lazygit/pkg/gui/mergeconflicts"
)
func (gui *Gui) handleSelectTop() error {
func (gui *Gui) handleSelectPrevConflictHunk() error {
return gui.withMergeConflictLock(func() error {
gui.takeOverMergeConflictScrolling()
gui.State.Panels.Merging.SelectTopOption()
gui.State.Panels.Merging.SelectPrevConflictHunk()
return gui.refreshMergePanel()
})
}
func (gui *Gui) handleSelectBottom() error {
func (gui *Gui) handleSelectNextConflictHunk() error {
return gui.withMergeConflictLock(func() error {
gui.takeOverMergeConflictScrolling()
gui.State.Panels.Merging.SelectBottomOption()
gui.State.Panels.Merging.SelectNextConflictHunk()
return gui.refreshMergePanel()
})
}
@@ -135,6 +135,8 @@ func (gui *Gui) resolveConflict(selection mergeconflicts.Selection) (bool, error
switch selection {
case mergeconflicts.TOP:
logStr = "Picking top hunk"
case mergeconflicts.MIDDLE:
logStr = "Picking middle hunk"
case mergeconflicts.BOTTOM:
logStr = "Picking bottom hunk"
case mergeconflicts.BOTH: