diff options
Diffstat (limited to 'read-cache.c')
| -rw-r--r-- | read-cache.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/read-cache.c b/read-cache.c index 4b8348c..9b6ce46 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; |