summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-05-07 13:13:43 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-05-07 13:13:43 -0700
commita28b919f05ed29cd9e6615179bd56edde50c6b63 (patch)
tree92f089912f4fcddf2386f69f5be40a1a1b047db2
parentMerge branch 'cb/maint-report-mount-point-correctly-in-setup' into maint (diff)
parentsequencer: remove additional blank line (diff)
downloadtgif-a28b919f05ed29cd9e6615179bd56edde50c6b63.tar.xz
Merge branch 'rt/cherry-revert-conflict-summary' into maint
In the older days, the header "Conflicts:" in "cherry-pick" and "merge" was separated by a blank line from the list of paths that follow for readability, but when "merge" was rewritten in C, we lost it by mistake. Remove the newline from "cherry-pick" to make them match again. By Ralf Thielow * rt/cherry-revert-conflict-summary: sequencer: remove additional blank line
-rw-r--r--sequencer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c
index 4307364b26..cd11e340dd 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -234,7 +234,7 @@ static int do_recursive_merge(struct commit *base, struct commit *next,
if (!clean) {
int i;
- strbuf_addstr(msgbuf, "\nConflicts:\n\n");
+ strbuf_addstr(msgbuf, "\nConflicts:\n");
for (i = 0; i < active_nr;) {
struct cache_entry *ce = active_cache[i++];
if (ce_stage(ce)) {