Merge branch 'nd/worktree-various-heads'

diff --git a/wt-status.c b/wt-status.c
index 0032ef5f6fad7ef5283615b8f52718c185e27428..4f27bd62af992122d83df911c42b585342ac1066 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -951,6 +951,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)