Merge branch 'ss/commit-dry-run-resolve-merge-to-no-op'
[git/git.git] / wt-status.c
index 1ea2ebe..1685630 100644 (file)
@@ -950,6 +950,7 @@ static void show_merge_in_progress(struct wt_status *s,
                        status_printf_ln(s, color,
                                _("  (fix conflicts and run \"git commit\")"));
        } else {
+               s-> commitable = 1;
                status_printf_ln(s, color,
                        _("All conflicts fixed but you are still merging."));
                if (s->hints)