summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1267660)
raw | patch | inline | side by side (parent: 1267660)
author | Linus Torvalds <torvalds@ppc970.osdl.org> | |
Sun, 19 Jun 2005 06:34:12 +0000 (23:34 -0700) | ||
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | |
Sun, 19 Jun 2005 06:34:12 +0000 (23:34 -0700) |
Pointed out by Junio, part of my debugging of the rewrite of the
file/dir conflict handling.
file/dir conflict handling.
read-cache.c | patch | blob | history |
diff --git a/read-cache.c b/read-cache.c
index 4b8348ca92b7ea9f955d890c417d05a6816f9ee0..9b6ce46b9fa57e85b5c9e6bf552dc27f40f6e5c5 100644 (file)
--- 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;