From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Sun, 19 Jun 2005 06:34:12 +0000 (-0700)
Subject: read-cache.c: remove stray debugging printf
X-Git-Tag: v0.99~250
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2160a025d2a20202e323d33d879521d23e28b709;p=git.git

read-cache.c: remove stray debugging printf

Pointed out by Junio, part of my debugging of the rewrite of the
file/dir conflict handling.
---

diff --git a/read-cache.c b/read-cache.c
index 4b8348ca9..9b6ce46b9 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;