diff options
Diffstat (limited to 'wt-status.c')
| -rw-r--r-- | wt-status.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/wt-status.c b/wt-status.c index 078a472743..6be55ae887 100644 --- a/wt-status.c +++ b/wt-status.c @@ -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) |