diff options
| author | Elijah Newren <newren@gmail.com> | 2011-08-11 23:19:49 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-14 14:19:34 -0700 |
| commit | c43ba42e8d3b3b85e322c36d35053f650835ce0a (patch) | |
| tree | fe89b115b489a047bd0cee3fd79d809da5edaa20 /merge-recursive.c | |
| parent | 7dd9c304be5f9299d7b4b8ddb59072f774ecf081 (diff) | |
| download | git-c43ba42e8d3b3b85e322c36d35053f650835ce0a.tar.gz | |
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>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index ae6ade4ecb..d6f238dab0 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"); |