mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mm/status-suggest-merge-abort'

Browse Source 
"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
This commit is contained in:
Junio C Hamano
2016-08-03 15:10:26 -07:00
parent d083d420b7 b0a61ab23c
commit 5a2f4d3eef
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wt-status.c
View File

@ -948,9 +948,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,