diff options
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 { |