diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2021-03-31 23:55:06 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2021-04-02 11:00:15 +1100 |
| commit | 7d62f103e4a1b39b7e8fbd0e1f39815c525cd588 (patch) | |
| tree | 83e331beeee07d066c76580e044234f18063a0a7 /pkg/gui/merge_panel.go | |
| parent | 9e85d37fb949bbc83f28cb079f2ac4b45ae895ce (diff) | |
big refactor to give our enums actual types
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 60ce4d560..5ae0ec9b6 100644 --- a/pkg/gui/merge_panel.go +++ b/pkg/gui/merge_panel.go @@ -303,7 +303,7 @@ func (gui *Gui) handleEscapeMerge() error { gui.takeOverScrolling() gui.State.Panels.Merging.EditHistory = stack.New() - if err := gui.refreshSidePanels(refreshOptions{scope: []int{FILES}}); err != nil { + if err := gui.refreshSidePanels(refreshOptions{scope: []RefreshableView{FILES}}); err != nil { return err } // it's possible this method won't be called from the merging view so we need to @@ -318,7 +318,7 @@ func (gui *Gui) handleCompleteMerge() error { if err := gui.stageSelectedFile(); err != nil { return err } - if err := gui.refreshSidePanels(refreshOptions{scope: []int{FILES}}); err != nil { + if err := gui.refreshSidePanels(refreshOptions{scope: []RefreshableView{FILES}}); err != nil { return err } // if we got conflicts after unstashing, we don't want to call any git |