summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoris Vink <joris@cvs.openbsd.org>2007-01-28 23:39:43 +0000
committerJoris Vink <joris@cvs.openbsd.org>2007-01-28 23:39:43 +0000
commit277e5e7d2cffbac58a86b595a2d2b65225757dbe (patch)
treeaaca2cfc8b29fa6fd9093a90514a0d9f38c6bef2
parentd942cd56b9671be510b47ea86189eb3a3e397e8d (diff)
hey look, i found another debug printf from my merging stuff!
kill-zap-nuke-remove-delete it.
-rw-r--r--usr.bin/cvs/checkout.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/usr.bin/cvs/checkout.c b/usr.bin/cvs/checkout.c
index 94553a4630c..f46a1094195 100644
--- a/usr.bin/cvs/checkout.c
+++ b/usr.bin/cvs/checkout.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: checkout.c,v 1.87 2007/01/28 02:04:45 joris Exp $ */
+/* $OpenBSD: checkout.c,v 1.88 2007/01/28 23:39:42 joris Exp $ */
/*
* Copyright (c) 2006 Joris Vink <joris@openbsd.org>
*
@@ -226,9 +226,6 @@ cvs_checkout_file(struct cvs_file *cf, RCSNUM *rnum, int co_flags)
return;
}
- if (co_flags & CO_MERGE)
- printf("merge on %s\n", cf->file_path);
-
if (cvs_server_active == 0) {
if (!(co_flags & CO_MERGE)) {
oflags = O_WRONLY | O_TRUNC;