sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-30 03:23:08 +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/files_panel.go
View File

@ -73,7 +73,7 @@ func (gui *Gui) selectFile(alreadySelected bool) error {
}
if node.File != nil && node.File.HasInlineMergeConflicts {
return gui.refreshMergePanel()
return gui.refreshMergePanelWithLock()
}
cmdStr := gui.GitCommand.WorktreeFileDiffCmdStr(node, false, !node.GetHasUnstagedChanges() && node.GetHasStagedChanges())