go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-29 23:17:32 +02:00
Code Issues Releases Activity

make integration test pass

Browse Source
This commit is contained in:
Jesse Duffield 2022-01-17 19:04:06 +11:00
parent 2691477aff
commit 595aca2a4b
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/gui/merge_panel.go
View File

@ -175,8 +175,7 @@ func (gui *Gui) renderConflicts(state *mergeconflicts.State, hasFocus bool) (boo
state.SetConflictsFromCat(cat) state.SetConflictsFromCat(cat)
if state.NoConflicts() { if state.NoConflicts() {
// we shouldn't end up here return false, gui.handleCompleteMerge()
return false, nil
} }
content := mergeconflicts.ColoredConflictFile(cat, state, hasFocus) content := mergeconflicts.ColoredConflictFile(cat, state, hasFocus)