go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2026-05-22 10:15:43 +02:00
Code Issues Releases Activity

color fixups

Browse Source
This commit is contained in:
Jesse Duffield
2021-08-01 16:02:49 +10:00
parent 123d624141
commit d626bcac00
10 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/gui/mergeconflicts/rendering.go
+1 -1
View File
@@ -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)