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

add mutex to prevent crashes with merge conflicts

Browse Source
This commit is contained in:
Jesse Duffield
2021-04-02 00:15:39 +11:00
parent efe43077bc
commit cc9293b386
4 changed files with 37 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/gui/context.go
View File

@ -286,7 +286,7 @@ func (gui *Gui) contextTree() ContextTree {
},
Merging: SimpleContextNode{
Context: BasicContext{
OnFocus: gui.refreshMergePanel,
OnFocus: gui.refreshMergePanelWithLock,
Kind: MAIN_CONTEXT,
ViewName: "main",
Key: MAIN_MERGING_CONTEXT_KEY,