diff options
Diffstat (limited to 'pkg/gui')
| -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) |