From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 10 Aug 2016 18:55:19 +0000 (-0700)
Subject: Merge branch 'mm/status-suggest-merge-abort' into maint
X-Git-Tag: v2.9.3~23
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/61efc5c2d81cbd8c9a5d145e1aab2f744772c856

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
---

61efc5c2d81cbd8c9a5d145e1aab2f744772c856
diff --cc wt-status.c
index 617a284304,f6f112b48c..b96be25966
--- a/wt-status.c
+++ b/wt-status.c
@@@ -947,11 -946,13 +947,14 @@@ static void show_merge_in_progress(stru
  {
  	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,
  			_("All conflicts fixed but you are still merging."));
  		if (s->hints)