diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2022-01-17 19:04:06 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-01-17 19:14:59 +1100 |
| commit | 595aca2a4ba8dbcfd62a7db1dac0ff302dc4bbf9 (patch) | |
| tree | 93810b52af2a44cd732f3bfc0548125d6bf6293d | |
| parent | 2691477aff8505275488e35af7611fb78b53b328 (diff) | |
make integration test pass
| -rw-r--r-- | pkg/gui/merge_panel.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkg/gui/merge_panel.go b/pkg/gui/merge_panel.go index 8abd55131..917fd3f1f 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) |