sequencer: remove additional blank line
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>
Ralf Thielow committed
Apr 18, 2012 at 23:07 UTC
51120683ec8664c8b34b8541a0518a4902ee9d94
1 file changed
+1
-1
sequencer.c
+1
-1
@@ -234,7 +234,7 @@ static int do_recursive_merge(struct commit *base, struct commit *next,
234
235
if (!clean) {
236
int i;
237
- strbuf_addstr(msgbuf, "\nConflicts:\n\n");
237
+ strbuf_addstr(msgbuf, "\nConflicts:\n");
238
for (i = 0; i < active_nr;) {
239
struct cache_entry *ce = active_cache[i++];
240
if (ce_stage(ce)) {