ComputerSurge/lazygit
3
0
Fork 0
Code Pull Requests 1 Activity

rename merging context to mergeConflicts

Browse Source
This commit is contained in:
Jesse Duffield
2022-08-06 18:05:00 +10:00
parent cd2c01d1cf
commit 445a625b56
16 changed files with 215 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/gui/files_panel.go
View File

@@ -93,7 +93,7 @@ func (gui *Gui) filesRenderToMain() error {
}
func (gui *Gui) onFocusFile() error {
gui.takeOverMergeConflictScrolling()
gui.State.Contexts.MergeConflicts.SetUserScrolling(false)
return nil
}