go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-11-29 22:48:24 +02:00
Code Issues Releases Activity

Replace PopContext() with Context().Pop()

Browse Source
This commit is contained in:
Stefan Haller
2024-08-08 10:18:37 +02:00
parent bd36b8a95e
commit 98335361fd
11 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -194,7 +194,7 @@ func (self *MergeConflictsController) context() *context.MergeConflictsContext {
}
func (self *MergeConflictsController) Escape() error {
return self.c.PopContext()
return self.c.Context().Pop()
}
func (self *MergeConflictsController) HandleEditFile() error {