go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-17 00:18:05 +02:00
Code Issues Releases Activity

Replace CurrentContext() with Context().Current()

Browse Source
This commit is contained in:
Stefan Haller
2024-08-08 10:26:55 +02:00
parent 8e15451117
commit 7ed94c0410
23 changed files with 24 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/gui/controllers/helpers/merge_conflicts_helper.go
View File

@ -123,7 +123,7 @@ func (self *MergeConflictsHelper) RefreshMergeState() error {
self.c.Contexts().MergeConflicts.GetMutex().Lock()
defer self.c.Contexts().MergeConflicts.GetMutex().Unlock()
if self.c.CurrentContext().GetKey() != context.MERGE_CONFLICTS_CONTEXT_KEY {
if self.c.Context().Current().GetKey() != context.MERGE_CONFLICTS_CONTEXT_KEY {
return nil
}