1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-31 14:24:25 +03:00

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

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

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 {