diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-05-13 21:10:00 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-05-13 21:24:25 +1000 |
| commit | 267730bc0059eacd0327eebbaa3b9efd04ee8464 (patch) | |
| tree | 33be8d44df0ad19ff38c5a8a266b761be7737cbd /pkg/gui/merge_panel.go | |
| parent | d5db02a899540661162ca3b816cd559ff577fff2 (diff) | |
standardise how we handle background coloursv0.20.3
Diffstat (limited to 'pkg/gui/merge_panel.go')
| -rw-r--r-- | pkg/gui/merge_panel.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pkg/gui/merge_panel.go b/pkg/gui/merge_panel.go index 4d9a258fc..d30f152ac 100644 --- a/pkg/gui/merge_panel.go +++ b/pkg/gui/merge_panel.go @@ -59,6 +59,7 @@ func (gui *Gui) coloredConflictFile(content string, conflicts []commands.Conflic colour := color.New(colourAttr) if hasFocus && conflictIndex < len(conflicts) && conflicts[conflictIndex] == conflict && gui.shouldHighlightLine(i, conflict, conflictTop) { colour.Add(color.Bold) + colour.Add(theme.SelectedLineBgColor) } if i == conflict.End && len(remainingConflicts) > 0 { conflict, remainingConflicts = gui.shiftConflict(remainingConflicts) |