diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2021-11-02 20:35:53 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2021-11-05 07:58:21 +1100 |
| commit | 37be9dbea18f52a544a1dd134657c02c1ee61aef (patch) | |
| tree | a18a51d7f998e41a76a2268c897d34133241229b /pkg/gui/merge_panel.go | |
| parent | f6ec7babf55c4a43bc8048e8a84970a8de8250b9 (diff) | |
support scrolling left and right
Diffstat (limited to 'pkg/gui/merge_panel.go')
| -rw-r--r-- | pkg/gui/merge_panel.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/gui/merge_panel.go b/pkg/gui/merge_panel.go index c0c55de6c..f9e2de55c 100644 --- a/pkg/gui/merge_panel.go +++ b/pkg/gui/merge_panel.go @@ -203,7 +203,7 @@ func (gui *Gui) catSelectedFile() (string, error) { } func (gui *Gui) scrollToConflict() error { - if gui.State.Panels.Merging.UserScrolling { + if gui.State.Panels.Merging.UserVerticalScrolling { return nil } @@ -315,5 +315,5 @@ func (gui *Gui) withMergeConflictLock(f func() error) error { } func (gui *Gui) takeOverMergeConflictScrolling() { - gui.State.Panels.Merging.UserScrolling = false + gui.State.Panels.Merging.UserVerticalScrolling = false } |