X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=read-cache.c;h=9b6ce46b9fa57e85b5c9e6bf552dc27f40f6e5c5;hb=180926636e47ecfe28d03cec493af75899994f0f;hp=4b8348ca92b7ea9f955d890c417d05a6816f9ee0;hpb=12676608fefd6b148bd9fd4cbd4eb6c2ff3e15e9;p=git.git

diff --git a/read-cache.c b/read-cache.c
index 4b8348ca..9b6ce46b 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -190,7 +190,6 @@ static int has_file_name(const struct cache_entry *ce, int pos, int ok_to_replac
 			break;
 		if (p->name[len] != '/')
 			continue;
-fprintf(stderr, "conflict: %s %s\n", ce->name, p->name);
 		retval = -1;
 		if (!ok_to_replace)
 			break;