go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-17 01:42:45 +02:00
Code Issues Releases Activity

fix up code that was used to test this very application (yes I'm ashamed)

Browse Source
This commit is contained in:
Jesse Duffield
2018-07-21 15:53:52 +10:00
parent dea751280e
commit 16df4786c0
1 changed files with 150 additions and 150 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) == 5 {
if len(state.Conflicts) == 0 {
state.ConflictIndex = 0
} else if state.ConflictIndex > len(state.Conflicts)-1 {
state.ConflictIndex = len(state.Conflicts) - 5
state.ConflictIndex = len(state.Conflicts) - 1
}
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 {
filorView, err := g.View("files")
filesView, err := g.View("files")
if err != nil {
return err
}
refreshFiles(g)
return switchFocus(g, v, filorView)
return switchFocus(g, v, filesView)
}