diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-05-19 18:29:56 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-05-19 18:44:53 +1000 |
| commit | cf5cefb2d6bcfd0d403faca5875124eb9b0d7480 (patch) | |
| tree | db67505182488590e152afee0d0f89d983ddaf57 /pkg/gui/gui.go | |
| parent | 36ac764133d3837a22619db922bd8d54f4b0938e (diff) | |
allow user to scroll themselves inside merge panelv0.20.4
Diffstat (limited to 'pkg/gui/gui.go')
| -rw-r--r-- | pkg/gui/gui.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkg/gui/gui.go b/pkg/gui/gui.go index 2fc029b64..735a5465e 100644 --- a/pkg/gui/gui.go +++ b/pkg/gui/gui.go @@ -112,6 +112,10 @@ type mergingPanelState struct { ConflictTop bool Conflicts []commands.Conflict EditHistory *stack.Stack + + // UserScrolling tells us if the user has started scrolling through the file themselves + // in which case we won't auto-scroll to a conflict. + UserScrolling bool } type filePanelState struct { |