Skip to content

Commit

Permalink
sequencer: remove additional blank line
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ralf Thielow authored and Junio C Hamano committed Apr 19, 2012
1 parent fdec2eb commit 5112068
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion sequencer.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down

0 comments on commit 5112068

Please sign in to comment.