Skip to content

Commit

Permalink
read-cache.c: remove stray debugging printf
Browse files Browse the repository at this point in the history
Pointed out by Junio, part of my debugging of the rewrite of the
file/dir conflict handling.
  • Loading branch information
Linus Torvalds committed Jun 19, 2005
1 parent 1267660 commit 2160a02
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion read-cache.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 2160a02

Please sign in to comment.