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

better handling of scrolling for conflicted files

Browse Source
This commit is contained in:
Jesse Duffield
2021-04-02 01:11:54 +11:00
parent eeeef9ca86
commit 216b5341ae
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/gui/files_panel.go
View File

@ -70,6 +70,7 @@ func (gui *Gui) selectFile(alreadySelected bool) error {
if err := gui.resetOrigin(gui.getSecondaryView()); err != nil {
return err
}
gui.takeOverMergeConflictScrolling()
}
if node.File != nil && node.File.HasInlineMergeConflicts {