diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-04-27 20:58:53 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-27 20:58:53 (GMT) |
| commit | f5b121aef305398a3e462b28240c0d6d754315c1 (patch) | |
| tree | cdc63f358e5258793205e337a907c56faef76d55 /sequencer.c | |
| parent | 7a9bb265d6b0d434fc967ea2dd7a2c446370ddf7 (diff) | |
| parent | 51120683ec8664c8b34b8541a0518a4902ee9d94 (diff) | |
| download | git-f5b121aef305398a3e462b28240c0d6d754315c1.zip git-f5b121aef305398a3e462b28240c0d6d754315c1.tar.gz git-f5b121aef305398a3e462b28240c0d6d754315c1.tar.bz2 | |
Merge branch 'rt/cherry-revert-conflict-summary'
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
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c index 4307364..cd11e34 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)) { |