diff --git a/merge-recursive.c b/merge-recursive.c
index dd4fbd0e6bc22f2e5f5667205b47165f8aebbbd0..22a31ed5ff5d1affd54da43769a3982ba2ec1b75 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
if (unmerged_cache()) {
int i;
- output(o, 0, "There are unmerged index entries:");
+ fprintf(stderr, "BUG: There are unmerged index entries:\n");
for (i = 0; i < active_nr; i++) {
struct cache_entry *ce = active_cache[i];
if (ce_stage(ce))
- output(o, 0, "%d %.*s", ce_stage(ce),
- (int)ce_namelen(ce), ce->name);
+ fprintf(stderr, "BUG: %d %.*s", ce_stage(ce),
+ (int)ce_namelen(ce), ce->name);
}
- return NULL;
+ die("Bug in merge-recursive.c");
}
if (!active_cache_tree)