mirrors/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-11 12:25:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge with example feature branch

Browse source
This commit is contained in:
Jesse Duffield 2018-06-09 22:49:40 +10:00
commit 027ea74ca9
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
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) == 6 {
state.ConflictIndex = 0
} else if state.ConflictIndex > len(state.Conflicts)-1 {
state.ConflictIndex = len(state.Conflicts) - 5
state.ConflictIndex = len(state.Conflicts) - 6
}
hasFocus := currentViewName(g) == "main"
if hasFocus {