summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2011-08-12 05:19:49 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-08-14 21:19:34 (GMT)
commitc43ba42e8d3b3b85e322c36d35053f650835ce0a (patch)
treefe89b115b489a047bd0cee3fd79d809da5edaa20
parent7dd9c304be5f9299d7b4b8ddb59072f774ecf081 (diff)
downloadgit-c43ba42e8d3b3b85e322c36d35053f650835ce0a.zip
git-c43ba42e8d3b3b85e322c36d35053f650835ce0a.tar.gz
git-c43ba42e8d3b3b85e322c36d35053f650835ce0a.tar.bz2
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>
-rw-r--r--merge-recursive.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c
index ae6ade4..d6f238d 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");