From 595aca2a4ba8dbcfd62a7db1dac0ff302dc4bbf9 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Mon, 17 Jan 2022 19:04:06 +1100 Subject: [PATCH] make integration test pass --- pkg/gui/merge_panel.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg/gui/merge_panel.go b/pkg/gui/merge_panel.go index 8abd55131fd..917fd3f1fd9 100644 --- a/pkg/gui/merge_panel.go +++ b/pkg/gui/merge_panel.go @@ -175,8 +175,7 @@ func (gui *Gui) renderConflicts(state *mergeconflicts.State, hasFocus bool) (boo state.SetConflictsFromCat(cat) if state.NoConflicts() { - // we shouldn't end up here - return false, nil + return false, gui.handleCompleteMerge() } content := mergeconflicts.ColoredConflictFile(cat, state, hasFocus)