make integration test pass

2022-01-17 19:14:59 +11:00
parent 2691477aff
commit 595aca2a4b
1 changed files with 1 additions and 2 deletions
@@ -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)