diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-18 23:34:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-18 23:34:12 -0700 |
| commit | 2160a025d2a20202e323d33d879521d23e28b709 (patch) | |
| tree | c5112c91d741b9ab2ee65313e9f01ce328fdb085 | |
| parent | 12676608fefd6b148bd9fd4cbd4eb6c2ff3e15e9 (diff) | |
| download | git-2160a025d2a20202e323d33d879521d23e28b709.tar.gz | |
read-cache.c: remove stray debugging printf
Pointed out by Junio, part of my debugging of the rewrite of the
file/dir conflict handling.
| -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 4b8348ca92..9b6ce46b9f 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; |