summaryrefslogtreecommitdiffstats
path: root/pkg/gui/mergeconflicts
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2021-08-01 16:02:49 +1000
committerJesse Duffield <jessedduffield@gmail.com>2021-08-01 16:14:56 +1000
commitd626bcac0029267d3f45223198902f5cb78d9dc1 (patch)
tree684b0bd2cb23d4fac8dc7a53a28e2fd83c314abd /pkg/gui/mergeconflicts
parent123d624141ca73b828bdd6c6b43ff16ce1ec0e49 (diff)
color fixups
Diffstat (limited to 'pkg/gui/mergeconflicts')
-rw-r--r--pkg/gui/mergeconflicts/rendering.go2
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)