diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-08-10 11:55:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-08-10 11:55:19 -0700 |
| commit | 61efc5c2d81cbd8c9a5d145e1aab2f744772c856 (patch) | |
| tree | 8377ac15f7319bf34d9f9a5869778c886b341a26 /wt-status.c | |
| parent | 00f27feb6afaa9e5f91a0852a5a20c041ba0a421 (diff) | |
| parent | b0a61ab23c0fd51a1b641b481e6a63f8661a8f9f (diff) | |
| download | git-61efc5c2d81cbd8c9a5d145e1aab2f744772c856.tar.gz git-61efc5c2d81cbd8c9a5d145e1aab2f744772c856.tar.xz | |
Merge branch 'mm/status-suggest-merge-abort' into maint
"git status" learned to suggest "merge --abort" during a conflicted
merge, just like it already suggests "rebase --abort" during a
conflicted rebase.
* mm/status-suggest-merge-abort:
status: suggest 'git merge --abort' when appropriate
Diffstat (limited to 'wt-status.c')
| -rw-r--r-- | wt-status.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/wt-status.c b/wt-status.c index 617a28430..b96be2596 100644 --- a/wt-status.c +++ b/wt-status.c @@ -947,9 +947,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 { s-> commitable = 1; status_printf_ln(s, color, |