diff options
Diffstat (limited to 'pkg/gui/merge_panel.go')
-rw-r--r-- | pkg/gui/merge_panel.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/gui/merge_panel.go b/pkg/gui/merge_panel.go index 25238ce4f..4b86cf6c0 100644 --- a/pkg/gui/merge_panel.go +++ b/pkg/gui/merge_panel.go @@ -212,7 +212,7 @@ func (gui *Gui) refreshMergePanel() error { if err != nil { return err } - if err := gui.renderString(gui.g, "main", content); err != nil { + if err := gui.newStringTask("main", content); err != nil { return err } if err := gui.scrollToConflict(gui.g); err != nil { |