===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/rcsmerge.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -c -r1.48 -r1.49
*** src/usr.bin/rcs/rcsmerge.c	2006/08/11 08:18:19	1.48
--- src/usr.bin/rcs/rcsmerge.c	2006/10/12 17:20:12	1.49
***************
*** 1,4 ****
! /*	$OpenBSD: rcsmerge.c,v 1.48 2006/08/11 08:18:19 xsa Exp $	*/
  /*
   * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: rcsmerge.c,v 1.49 2006/10/12 17:20:12 niallo Exp $	*/
  /*
   * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
   * All rights reserved.
***************
*** 118,124 ****
  		warnx("warning: excess arguments ignored");
  
  	if ((fd = rcs_choosefile(argv[0], fpath, sizeof(fpath))) < 0)
! 		errx(status, "%s", fpath);
  
  	if (!(flags & QUIET))
  		(void)fprintf(stderr, "RCS file: %s\n", fpath);
--- 118,124 ----
  		warnx("warning: excess arguments ignored");
  
  	if ((fd = rcs_choosefile(argv[0], fpath, sizeof(fpath))) < 0)
! 		err(status, "%s", fpath);
  
  	if (!(flags & QUIET))
  		(void)fprintf(stderr, "RCS file: %s\n", fpath);