summaryrefslogtreecommitdiffstats
path: root/pkg
diff options
context:
space:
mode:
Diffstat (limited to 'pkg')
-rw-r--r--pkg/gui/gui.go21
1 files changed, 10 insertions, 11 deletions
diff --git a/pkg/gui/gui.go b/pkg/gui/gui.go
index 5b62236af..f001a8113 100644
--- a/pkg/gui/gui.go
+++ b/pkg/gui/gui.go
@@ -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