Skip to content


Subversion checkout URL

You can clone with
Download ZIP
Browse files

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
  • Loading branch information...
2 parents 7a9bb26 + 5112068 commit f5b121aef305398a3e462b28240c0d6d754315c1 @gitster gitster committed
Showing with 1 addition and 1 deletion.
  1. +1 −1  sequencer.c
2  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)) {

0 comments on commit f5b121a

Please sign in to comment.
Something went wrong with that request. Please try again.