diff options
Diffstat (limited to 'wt-status.c')
| -rw-r--r-- | wt-status.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/wt-status.c b/wt-status.c index 4ce4e35ac..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, @@ -1062,7 +1065,7 @@ static void abbrev_sha1_in_line(struct strbuf *line) strbuf_addf(split[1], "%s ", abbrev); strbuf_reset(line); for (i = 0; split[i]; i++) - strbuf_addf(line, "%s", split[i]->buf); + strbuf_addbuf(line, split[i]); } } strbuf_list_free(split); |