=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/rcsmerge.c,v retrieving revision 1.7 retrieving revision 1.8 diff -c -r1.7 -r1.8 *** src/usr.bin/rcs/rcsmerge.c 2005/11/02 11:26:19 1.7 --- src/usr.bin/rcs/rcsmerge.c 2005/11/02 13:21:37 1.8 *************** *** 1,4 **** ! /* $OpenBSD: rcsmerge.c,v 1.7 2005/11/02 11:26:19 xsa Exp $ */ /* * Copyright (c) 2005 Xavier Santolaria * All rights reserved. --- 1,4 ---- ! /* $OpenBSD: rcsmerge.c,v 1.8 2005/11/02 13:21:37 xsa Exp $ */ /* * Copyright (c) 2005 Xavier Santolaria * All rights reserved. *************** *** 116,121 **** --- 116,123 ---- frev = file->rf_head; 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");