From: Andrew Wong Date: Wed, 26 Feb 2014 18:06:23 GMT Subject: [RFC 1/3] wt-status: Make conflict hint message more consistent with other hints Message-ID: <1393437985-31401-2-git-send-email-andrew.kw.w@gmail.com> In-Reply-To: <1393437985-31401-1-git-send-email-andrew.kw.w@gmail.com> Signed-off-by: Andrew Wong --- wt-status.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wt-status.c b/wt-status.c index 4e55810..6e1ad7d 100644 --- a/wt-status.c +++ b/wt-status.c @@ -899,7 +899,7 @@ static void show_merge_in_progress(struct wt_status *s, status_printf_ln(s, color, _("You have unmerged paths.")); if (s->hints) status_printf_ln(s, color, - _(" (fix conflicts and run \"git commit\")")); + _(" (fix conflicts, and use \"git commit\" to conclude the merge)")); } else { status_printf_ln(s, color, _("All conflicts fixed but you are still merging.")); -- 1.9.0.6.g16e5f9a