Browse Source

read-cache.c: remove stray debugging printf

Pointed out by Junio, part of my debugging of the rewrite of the
file/dir conflict handling.
maint
Linus Torvalds 20 years ago
parent
commit
2160a025d2
  1. 1
      read-cache.c

1
read-cache.c

@ -190,7 +190,6 @@ static int has_file_name(const struct cache_entry *ce, int pos, int ok_to_replac @@ -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;

Loading…
Cancel
Save