1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-28 16:02:01 +03:00

Keep side context in context stack when pushing a main context

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

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 {