===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/rcsmerge.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -c -r1.34 -r1.35
*** src/usr.bin/rcs/rcsmerge.c	2006/04/25 03:25:42	1.34
--- src/usr.bin/rcs/rcsmerge.c	2006/04/25 13:36:35	1.35
***************
*** 1,4 ****
! /*	$OpenBSD: rcsmerge.c,v 1.34 2006/04/25 03:25:42 ray Exp $	*/
  /*
   * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: rcsmerge.c,v 1.35 2006/04/25 13:36:35 xsa Exp $	*/
  /*
   * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
   * All rights reserved.
***************
*** 127,137 ****
  			rev1 = rcsnum_alloc();
  			rcsnum_cpy(file->rf_head, rev1, 0);
  		} else if ((rev1 = rcs_getrevnum(rev_str1, file)) == NULL)
! 			fatal("invalid revision: %s", rev_str1);
  
  		if (rev_str2 != NULL && strcmp(rev_str2, "") != 0) {
  			if ((rev2 = rcs_getrevnum(rev_str2, file)) == NULL)
! 				fatal("invalid revision: %s", rev_str2);
  		} else {
  			rev2 = rcsnum_alloc();
  			rcsnum_cpy(file->rf_head, rev2, 0);
--- 127,137 ----
  			rev1 = rcsnum_alloc();
  			rcsnum_cpy(file->rf_head, rev1, 0);
  		} else if ((rev1 = rcs_getrevnum(rev_str1, file)) == NULL)
! 			errx(1, "invalid revision: %s", rev_str1);
  
  		if (rev_str2 != NULL && strcmp(rev_str2, "") != 0) {
  			if ((rev2 = rcs_getrevnum(rev_str2, file)) == NULL)
! 				errx(1, "invalid revision: %s", rev_str2);
  		} else {
  			rev2 = rcsnum_alloc();
  			rcsnum_cpy(file->rf_head, rev2, 0);