[PATCH] git-apply: Don't barf when --stat'ing a diff with no line changes.

[git.git] / read-cache.c

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