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

better locking of merge panel state

Browse Source
This commit is contained in:
Jesse Duffield
2022-01-27 20:10:25 +11:00
parent 7f85bf5563
commit 84a1992055
4 changed files with 84 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/gui/context_config.go
View File

@@ -167,7 +167,7 @@ func (gui *Gui) contextTree() ContextTree {
Key: MAIN_PATCH_BUILDING_CONTEXT_KEY,
},
Merging: &BasicContext{
OnFocus: OnFocusWrapper(gui.renderConflictsWithFocus),
OnFocus: OnFocusWrapper(func() error { return gui.renderConflictsWithLock(true) }),
Kind: MAIN_CONTEXT,
ViewName: "main",
Key: MAIN_MERGING_CONTEXT_KEY,