summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7dd9c30)
raw | patch | inline | side by side (parent: 7dd9c30)
author | Elijah Newren <newren@gmail.com> | |
Fri, 12 Aug 2011 05:19:49 +0000 (23:19 -0600) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sun, 14 Aug 2011 21:19:34 +0000 (14:19 -0700) |
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>
merge-recursive.c and debugging...
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.c | patch | blob | history |
diff --git a/merge-recursive.c b/merge-recursive.c
index ae6ade4ecbbcc77bc952d223f0ae90ae2c77a0c7..d6f238dab08a0bb56067d2eb409a9b46980eee04 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
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");