make integration test pass

jesseduffield · Jan 17, 2022 · 595aca2 · 595aca2
1 parent 2691477
commit 595aca2
Showing 1 changed file with 1 addition and 2 deletions.
diff --git 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)