From b0a61ab23c0fd51a1b641b481e6a63f8661a8f9f Mon Sep 17 00:00:00 2001 From: Matthieu Moy Date: Thu, 21 Jul 2016 14:58:37 +0200 Subject: status: suggest 'git merge --abort' when appropriate We already suggest 'git rebase --abort' during a conflicted rebase. Similarly, suggest 'git merge --abort' during conflict resolution on 'git merge'. Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano --- wt-status.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'wt-status.c') diff --git a/wt-status.c b/wt-status.c index ced53dd1d4..f6f112b48c 100644 --- a/wt-status.c +++ b/wt-status.c @@ -946,9 +946,12 @@ static void show_merge_in_progress(struct wt_status *s, { if (has_unmerged(s)) { status_printf_ln(s, color, _("You have unmerged paths.")); - if (s->hints) + if (s->hints) { status_printf_ln(s, color, - _(" (fix conflicts and run \"git commit\")")); + _(" (fix conflicts and run \"git commit\")")); + status_printf_ln(s, color, + _(" (use \"git merge --abort\" to abort the merge)")); + } } else { status_printf_ln(s, color, _("All conflicts fixed but you are still merging.")); -- cgit v1.2.3