read-cache.c: remove stray debugging printf

Pointed out by Junio, part of my debugging of the rewrite of the
file/dir conflict handling.
This commit is contained in:
Linus Torvalds 2005-06-18 23:34:12 -07:00
parent 12676608fe
commit 2160a025d2

View File

@ -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;