diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2022-01-26 01:20:19 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-01-26 14:50:47 +1100 |
| commit | c8cc18920f0b5ab54a19b9f7bdcf83db3210576f (patch) | |
| tree | 60623fbe5504469b9a4f4ca25a9a538b4eee52ce /pkg/gui/global_handlers.go | |
| parent | ce3bcfe37cf0c68f501fb09d543e9e212b0eaa61 (diff) | |
improve merge conflict flow
Diffstat (limited to 'pkg/gui/global_handlers.go')
| -rw-r--r-- | pkg/gui/global_handlers.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/gui/global_handlers.go b/pkg/gui/global_handlers.go index f2ef52986..22b43b6b7 100644 --- a/pkg/gui/global_handlers.go +++ b/pkg/gui/global_handlers.go @@ -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 } |