wt-status.c: set commitable bit if there is a meaningful merge.
[git/git.git] / wt-status.c
index 078a472..6be55ae 100644 (file)
@@ -949,6 +949,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)