go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-11-25 22:32:13 +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

8
pkg/gui/mergeconflicts/state.go
View File

@@ -155,7 +155,13 @@ func (s *State) Active() bool {
}
func (s *State) GetConflictMiddle() int {
return s.currentConflict().target
currentConflict := s.currentConflict()
if currentConflict == nil {
return 0
}
return currentConflict.target
}
func (s *State) ContentAfterConflictResolve(selection Selection) (bool, string, error) {