go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-08-13 20:04:25 +02:00
Code Issues Releases Activity

Keep side context in context stack when pushing a main context

Browse Source 
This fixes accordion mode for the commit files panel. When entering a file, the
commit files panel should stay expanded.
This commit is contained in:
Stefan Haller
2023-03-04 14:43:20 +01:00
parent 40a29fd622
commit 723504a290
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/gui/controllers/merge_conflicts_controller.go
View File

@@ -162,7 +162,7 @@ func (self *MergeConflictsController) context() *context.MergeConflictsContext {
}
func (self *MergeConflictsController) Escape() error {
return self.c.PushContext(self.contexts.Files)
return self.c.PopContext()
}
func (self *MergeConflictsController) HandleEditFile() error {