summaryrefslogtreecommitdiff
path: root/usr.bin/rcs/rcsmerge.c
diff options
context:
space:
mode:
authorXavier Santolaria <xsa@cvs.openbsd.org>2005-11-02 13:21:38 +0000
committerXavier Santolaria <xsa@cvs.openbsd.org>2005-11-02 13:21:38 +0000
commit740bafc54fcd1f46e75f5c013548a9dffac4ff1f (patch)
tree34191fa237950314218897cd11e2992306aa8181 /usr.bin/rcs/rcsmerge.c
parent7741ae8aa5fe25ad538048ef77bf9e9d5c38cc7a (diff)
print RCS file path;
Diffstat (limited to 'usr.bin/rcs/rcsmerge.c')
-rw-r--r--usr.bin/rcs/rcsmerge.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.bin/rcs/rcsmerge.c b/usr.bin/rcs/rcsmerge.c
index e15b82519b7..34ea85038f6 100644
--- a/usr.bin/rcs/rcsmerge.c
+++ b/usr.bin/rcs/rcsmerge.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rcsmerge.c,v 1.7 2005/11/02 11:26:19 xsa Exp $ */
+/* $OpenBSD: rcsmerge.c,v 1.8 2005/11/02 13:21:37 xsa Exp $ */
/*
* Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org>
* All rights reserved.
@@ -117,6 +117,8 @@ rcsmerge_main(int argc, char **argv)
else
frev = rev2;
+ printf("RCS file: %s\n", fpath);
+
if ((bp = cvs_diff3(file, argv[i], baserev, frev)) == NULL) {
cvs_log(LP_ERR, "failed to merge");
rcs_close(file);