From 8dc874b2ee61f0c457c4482ed2f202cac55b52ad Mon Sep 17 00:00:00 2001 From: "Stephen P. Smith" Date: Mon, 15 Feb 2016 19:38:25 -0700 Subject: wt-status.c: set commitable bit if there is a meaningful merge. The 'commit --dry-run' and 'commit' return values differed if a conflicted merge had been resolved and the resulting commit would record the same tree as the parent. Update show_merge_in_progress to set the commitable bit if conflicts have been resolved and a merge is in progress. Signed-off-by: Stephen P. Smith Signed-off-by: Junio C Hamano --- wt-status.c | 1 + 1 file changed, 1 insertion(+) (limited to 'wt-status.c') 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) -- cgit v1.2.3