diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-18 22:02:35 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-23 14:29:18 +1000 |
| commit | f5b22d94d939b0fc1aff433686e891e0a7507950 (patch) | |
| tree | 9812c4c7f3855d7e3fe973dacf5533ef04463c3d /pkg/gui/merge_panel.go | |
| parent | 3c87ff4eff46449d5e697e954b3bdf01d2c76f19 (diff) | |
WIP
Diffstat (limited to 'pkg/gui/merge_panel.go')
| -rw-r--r-- | pkg/gui/merge_panel.go | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/pkg/gui/merge_panel.go b/pkg/gui/merge_panel.go index 1097c3d62..56e2535ba 100644 --- a/pkg/gui/merge_panel.go +++ b/pkg/gui/merge_panel.go @@ -238,14 +238,13 @@ func (gui *Gui) refreshMergePanel() error { return err } - mainView := gui.getMainView() - mainView.Wrap = false - - if err := gui.newStringTaskWithoutScroll("main", content); err != nil { - return err - } - - return nil + return gui.refreshMain(refreshMainOpts{ + main: &viewUpdateOpts{ + title: gui.Tr.SLocalize("MergeConflictsTitle"), + task: gui.createRenderStringWithoutScrollTask(content), + noWrap: true, + }, + }) } func (gui *Gui) catSelectedFile(g *gocui.Gui) (string, error) { |