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

split context common from helper common

Browse Source
This commit is contained in:
Jesse Duffield
2023-03-23 12:35:07 +11:00
parent f081358943
commit 43251e7275
55 changed files with 156 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/gui/context/merge_conflicts_context.go
View File

@@ -11,7 +11,7 @@ import (
type MergeConflictsContext struct {
types.Context
viewModel *ConflictsViewModel
c *types.HelperCommon
c *ContextCommon
mutex *deadlock.Mutex
}
@@ -24,7 +24,7 @@ type ConflictsViewModel struct {
}
func NewMergeConflictsContext(
c *types.HelperCommon,
c *ContextCommon,
) *MergeConflictsContext {
viewModel := &ConflictsViewModel{
state: mergeconflicts.NewState(),