diff options
Diffstat (limited to 'pkg/gui/mergeconflicts/state.go')
| -rw-r--r-- | pkg/gui/mergeconflicts/state.go | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkg/gui/mergeconflicts/state.go b/pkg/gui/mergeconflicts/state.go index 0889aaf41..d84f05545 100644 --- a/pkg/gui/mergeconflicts/state.go +++ b/pkg/gui/mergeconflicts/state.go @@ -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) { |