diff options
Diffstat (limited to 'pkg/gui/mergeconflicts/rendering.go')
| -rw-r--r-- | pkg/gui/mergeconflicts/rendering.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/gui/mergeconflicts/rendering.go b/pkg/gui/mergeconflicts/rendering.go index 67aa6c49d..45fff634a 100644 --- a/pkg/gui/mergeconflicts/rendering.go +++ b/pkg/gui/mergeconflicts/rendering.go @@ -21,7 +21,7 @@ func ColoredConflictFile(content string, state *State, hasFocus bool) string { } if hasFocus && state.conflictIndex < len(state.conflicts) && *state.conflicts[state.conflictIndex] == *conflict && shouldHighlightLine(i, conflict, state.conflictTop) { - textStyle = theme.SelectedRangeBgColor.SetBold() + textStyle = textStyle.MergeStyle(theme.SelectedRangeBgColor).SetBold() } if i == conflict.end && len(remainingConflicts) > 0 { conflict, remainingConflicts = shiftConflict(remainingConflicts) |