diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-03-28 09:57:36 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-03-28 11:59:45 +1100 |
| commit | 906a49049e2c10886fbf7f97ffabddd78b975f0e (patch) | |
| tree | 880ced3f910b98e206ec9aac67b1df44606a8c13 /pkg/gui/merge_panel.go | |
| parent | c1a4bd0482ab06279700fa95404131ef24a2297d (diff) | |
smart refreshing files
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 e94d5541c..fa238ccb7 100644 --- a/pkg/gui/merge_panel.go +++ b/pkg/gui/merge_panel.go @@ -261,7 +261,7 @@ func (gui *Gui) renderMergeOptions() error { func (gui *Gui) handleEscapeMerge(g *gocui.Gui, v *gocui.View) error { gui.State.Panels.Merging.EditHistory = stack.New() - if err := gui.refreshFiles(); err != nil { + if err := gui.refreshSidePanels(refreshOptions{scope: []int{FILES}}); err != nil { return err } // it's possible this method won't be called from the merging view so we need to @@ -276,7 +276,7 @@ func (gui *Gui) handleCompleteMerge() error { if err := gui.stageSelectedFile(gui.g); err != nil { return err } - if err := gui.refreshFiles(); err != nil { + if err := gui.refreshSidePanels(refreshOptions{scope: []int{FILES}}); err != nil { return err } // if we got conflicts after unstashing, we don't want to call any git |