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 efb6c5544..0d10ed4d7 100644 --- a/pkg/gui/merge_panel.go +++ b/pkg/gui/merge_panel.go @@ -205,7 +205,7 @@ func (gui *Gui) refreshMergePanel() error { panelState.ConflictIndex = len(panelState.Conflicts) - 1 } - hasFocus := gui.currentViewName(gui.g) == "main" + hasFocus := gui.currentViewName() == "main" content, err := gui.coloredConflictFile(cat, panelState.Conflicts, panelState.ConflictIndex, panelState.ConflictTop, hasFocus) if err != nil { return err |