X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=merge-recursive.c;h=cb53b01c19159e66ef265bde7feceabebab42232;hb=bde873c52914b40377a12764cab926ee974c3f32;hp=1239647fc0bcda68e744f5f3040c99314c8b8714;hpb=fcb2a7e4a3c7899a3432f5804889fa3ea5779220;p=git.git

diff --git a/merge-recursive.c b/merge-recursive.c
index 1239647fc..cb53b01c1 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -202,14 +202,14 @@ struct tree *write_tree_from_memory(struct merge_options *o)
 
 	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)