go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-08-10 22:42:00 +02:00
Code Issues Releases Activity

remove HasMergeConflicts struct instance variables

Browse Source
This commit is contained in:
Jesse Duffield
2019-02-18 19:28:02 +11:00
parent cb372d469f
commit 43ab7318d3
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/gui/gui.go
View File

@@ -124,17 +124,16 @@ type panelStates struct {
} }
type guiState struct { type guiState struct {
Files []*commands.File Files []*commands.File
Branches []*commands.Branch Branches []*commands.Branch
Commits []*commands.Commit Commits []*commands.Commit
StashEntries []*commands.StashEntry StashEntries []*commands.StashEntry
PreviousView string PreviousView string
HasMergeConflicts bool Platform commands.Platform
Platform commands.Platform Updating bool
Updating bool Panels *panelStates
Panels *panelStates WorkingTreeState string // one of "merging", "rebasing", "normal"
WorkingTreeState string // one of "merging", "rebasing", "normal" Contexts map[string]string
Contexts map[string]string
} }
// NewGui builds a new gui handler // NewGui builds a new gui handler