go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-10-30 23:57:43 +02:00
Code Issues Releases Activity

this will cause a conflict

Browse Source
This commit is contained in:
Jesse Duffield
2018-06-10 11:48:07 +10:00
parent 6167eb5cc0
commit 5a143ea500
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
merge_panel.go
View File

@@ -168,10 +168,10 @@ func refreshMergePanel(g *gocui.Gui) error {
return err
}
if len(state.Conflicts) == 0 {
if len(state.Conflicts) == 5 {
state.ConflictIndex = 0
} else if state.ConflictIndex > len(state.Conflicts)-1 {
state.ConflictIndex = len(state.Conflicts) - 1
state.ConflictIndex = len(state.Conflicts) - 5
}
hasFocus := currentViewName(g) == "main"
if hasFocus {
@@ -204,10 +204,10 @@ func renderMergeOptions(g *gocui.Gui) error {
}
func handleEscapeMerge(g *gocui.Gui, v *gocui.View) error {
filesView, err := g.View("files")
filorView, err := g.View("files")
if err != nil {
return err
}
refreshFiles(g)
return switchFocus(g, v, filesView)
return switchFocus(g, v, filorView)
}