From: Elijah Newren <newren@gmail.com>
Date: Fri, 12 Aug 2011 05:19:49 +0000 (-0600)
Subject: merge-recursive: Make BUG message more legible by adding a newline
X-Git-Tag: v1.7.7-rc1~28^2~41
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c43ba42e8d3b3b85e322c36d35053f650835ce0a;p=git.git

merge-recursive: Make BUG message more legible by adding a newline

Hopefully no one ever hits this error except when making large changes to
merge-recursive.c and debugging...

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/merge-recursive.c b/merge-recursive.c
index ae6ade4ec..d6f238dab 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -230,7 +230,7 @@ struct tree *write_tree_from_memory(struct merge_options *o)
 		for (i = 0; i < active_nr; i++) {
 			struct cache_entry *ce = active_cache[i];
 			if (ce_stage(ce))
-				fprintf(stderr, "BUG: %d %.*s", ce_stage(ce),
+				fprintf(stderr, "BUG: %d %.*s\n", ce_stage(ce),
 					(int)ce_namelen(ce), ce->name);
 		}
 		die("Bug in merge-recursive.c");