diff options
| author | mjarkk <mkopenga@gmail.com> | 2019-10-18 09:48:37 +0200 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2019-10-20 12:32:57 +1100 |
| commit | 02fef3136f27a0a93352ee62f47d4924e54389dd (patch) | |
| tree | 1be96988ffda2cc6f29c1d06ebf60d8677c5121c /pkg/gui/merge_panel.go | |
| parent | 8fe0e00cd9484c231c79c77ad3bc3dd601f0451a (diff) | |
Added light theme option to the settings
Diffstat (limited to 'pkg/gui/merge_panel.go')
| -rw-r--r-- | pkg/gui/merge_panel.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkg/gui/merge_panel.go b/pkg/gui/merge_panel.go index 1b4f1a88f..5b08ddbdc 100644 --- a/pkg/gui/merge_panel.go +++ b/pkg/gui/merge_panel.go @@ -14,6 +14,7 @@ import ( "github.com/golang-collections/collections/stack" "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/commands" + "github.com/jesseduffield/lazygit/pkg/theme" "github.com/jesseduffield/lazygit/pkg/utils" ) @@ -50,7 +51,7 @@ func (gui *Gui) coloredConflictFile(content string, conflicts []commands.Conflic conflict, remainingConflicts := gui.shiftConflict(conflicts) var outputBuffer bytes.Buffer for i, line := range utils.SplitLines(content) { - colourAttr := color.FgWhite + colourAttr := theme.DefaultTextColor if i == conflict.Start || i == conflict.Middle || i == conflict.End { colourAttr = color.FgRed } |