mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-19 21:08:12 +02:00
Code

Merge branch 'rt/cherry-revert-conflict-summary' into maint

Browse Source 
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
This commit is contained in:
Junio C Hamano 2012-05-07 13:13:43 -07:00
commit a28b919f05
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sequencer.c
View File

@ -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)) {