mirrors/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-11 12:25:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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 {
Files []*commands.File
Branches []*commands.Branch
Commits []*commands.Commit
StashEntries []*commands.StashEntry
PreviousView string
HasMergeConflicts bool
Platform commands.Platform
Updating bool
Panels *panelStates
WorkingTreeState string // one of "merging", "rebasing", "normal"
Contexts map[string]string
Files []*commands.File
Branches []*commands.Branch
Commits []*commands.Commit
StashEntries []*commands.StashEntry
PreviousView string
Platform commands.Platform
Updating bool
Panels *panelStates
WorkingTreeState string // one of "merging", "rebasing", "normal"
Contexts map[string]string
}
// NewGui builds a new gui handler