make integration test pass

jesseduffield · jesseduffield · commit 595aca2a4ba8 · 2022-01-17T19:14:59.000+11:00
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)

Original file line number	Diff line number	Diff line change
`@@ -175,8 +175,7 @@ func (gui Gui) renderConflicts(state mergeconflicts.State, hasFocus bool) (boo`
`175`	`175`	`state.SetConflictsFromCat(cat)`
`176`	`176`
`177`	`177`	`if state.NoConflicts() {`
`178`		`- // we shouldn't end up here`
`179`		`- return false, nil`
	`178`	`+ return false, gui.handleCompleteMerge()`
`180`	`179`	`}`
`181`	`180`
`182`	`181`	`content := mergeconflicts.ColoredConflictFile(cat, state, hasFocus)`