development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-28 19:25:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

sequencer: remove additional blank line

Browse source 
Remove an additional blank line between the
headline and the list of conflicted files after
doing a recursive merge.

Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ralf Thielow 2012-04-18 23:07:25 +02:00 committed by Junio C Hamano
parent fdec2eb8eb
commit 51120683ec
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) { if (!clean) {
int i; int i;
strbuf_addstr(msgbuf, "\nConflicts:\n\n"); strbuf_addstr(msgbuf, "\nConflicts:\n");
for (i = 0; i < active_nr;) { for (i = 0; i < active_nr;) {
struct cache_entry *ce = active_cache[i++]; struct cache_entry *ce = active_cache[i++];
if (ce_stage(ce)) { if (ce_stage(ce)) {