diff options
| author |   xsa <xsa@openbsd.org> | 2005-11-02 13:21:37 +0000 |
|---|---|---|
| committer | xsa <xsa@openbsd.org> | 2005-11-02 13:21:37 +0000 |
| commit | fa63c61a6cb8d841e7caac349ad58b19cc321b3e (patch) | |
| tree | d72e7821c63d2149970e7625da461373c9c15af6 | |
| parent | Use the new rde_filter_equal() with dir = DIR_OUT to check if a soft- (diff) | |
| download | wireguard-openbsd-fa63c61a6cb8d841e7caac349ad58b19cc321b3e.tar.xz wireguard-openbsd-fa63c61a6cb8d841e7caac349ad58b19cc321b3e.zip | |
print RCS file path;
| -rw-r--r-- | usr.bin/rcs/rcsmerge.c | 4 |
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); |