diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2022-01-26 01:20:19 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-01-26 14:50:47 +1100 |
| commit | c8cc18920f0b5ab54a19b9f7bdcf83db3210576f (patch) | |
| tree | 60623fbe5504469b9a4f4ca25a9a538b4eee52ce /pkg/gui/gui.go | |
| parent | ce3bcfe37cf0c68f501fb09d543e9e212b0eaa61 (diff) | |
improve merge conflict flow
Diffstat (limited to 'pkg/gui/gui.go')
| -rw-r--r-- | pkg/gui/gui.go | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/pkg/gui/gui.go b/pkg/gui/gui.go index f46d3c756..3549e186f 100644 --- a/pkg/gui/gui.go +++ b/pkg/gui/gui.go @@ -292,10 +292,11 @@ type guiState struct { // managers for them which handle rendering a flat list of files in tree form FileTreeViewModel *filetree.FileTreeViewModel CommitFileTreeViewModel *filetree.CommitFileTreeViewModel - Submodules []*models.SubmoduleConfig - Branches []*models.Branch - Commits []*models.Commit - StashEntries []*models.StashEntry + + Submodules []*models.SubmoduleConfig + Branches []*models.Branch + Commits []*models.Commit + StashEntries []*models.StashEntry // Suggestions will sometimes appear when typing into a prompt Suggestions []*types.Suggestion // FilteredReflogCommits are the ones that appear in the reflog panel. @@ -304,13 +305,14 @@ type guiState struct { // ReflogCommits are the ones used by the branches panel to obtain recency values // if we're not in filtering mode, CommitFiles and FilteredReflogCommits will be // one and the same - ReflogCommits []*models.Commit - SubCommits []*models.Commit - Remotes []*models.Remote - RemoteBranches []*models.RemoteBranch - Tags []*models.Tag - MenuItems []*menuItem - BisectInfo *git_commands.BisectInfo + ReflogCommits []*models.Commit + SubCommits []*models.Commit + Remotes []*models.Remote + RemoteBranches []*models.RemoteBranch + Tags []*models.Tag + MenuItems []*menuItem + BisectInfo *git_commands.BisectInfo + Updating bool Panels *panelStates SplitMainPanel bool |