go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-11-23 22:24:51 +02:00
Code Issues Releases Activity

improve merge conflict flow

Browse Source
This commit is contained in:
Jesse Duffield
2022-01-26 01:20:19 +11:00
parent ce3bcfe37c
commit c8cc18920f
17 changed files with 396 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/gui/global_handlers.go
View File

@@ -115,7 +115,7 @@ func (gui *Gui) linesToScrollDown(view *gocui.View) int {
}
func (gui *Gui) scrollUpMain() error {
if gui.canScrollMergePanel() {
if gui.renderingConflicts() {
gui.State.Panels.Merging.UserVerticalScrolling = true
}
@@ -123,7 +123,7 @@ func (gui *Gui) scrollUpMain() error {
}
func (gui *Gui) scrollDownMain() error {
if gui.canScrollMergePanel() {
if gui.renderingConflicts() {
gui.State.Panels.Merging.UserVerticalScrolling = true
}