diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-23 09:46:28 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-23 14:29:18 +1000 |
| commit | 0dd2c869a8808e937c69f8ce0ba04015e5a9075e (patch) | |
| tree | 24cbbe2466752c0510705384f196347b46373888 /pkg/gui/merge_panel.go | |
| parent | ed85ea69bd74d2914b8224c83d481e43179e7699 (diff) | |
minor refactor
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 bfe3536fe..c23549d39 100644 --- a/pkg/gui/merge_panel.go +++ b/pkg/gui/merge_panel.go @@ -217,7 +217,7 @@ func (gui *Gui) refreshMergePanel() error { panelState := gui.State.Panels.Merging cat, err := gui.catSelectedFile(gui.g) if err != nil { - return gui.refreshMain(refreshMainOpts{ + return gui.refreshMainViews(refreshMainOpts{ main: &viewUpdateOpts{ title: "", task: gui.createRenderStringTask(err.Error()), @@ -244,7 +244,7 @@ func (gui *Gui) refreshMergePanel() error { return err } - return gui.refreshMain(refreshMainOpts{ + return gui.refreshMainViews(refreshMainOpts{ main: &viewUpdateOpts{ title: gui.Tr.SLocalize("MergeConflictsTitle"), task: gui.createRenderStringWithoutScrollTask(content), |