===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/rcsmerge.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -c -r1.16 -r1.17
*** src/usr.bin/rcs/rcsmerge.c	2006/03/06 14:44:51	1.16
--- src/usr.bin/rcs/rcsmerge.c	2006/03/07 01:40:52	1.17
***************
*** 1,4 ****
! /*	$OpenBSD: rcsmerge.c,v 1.16 2006/03/06 14:44:51 jmc Exp $	*/
  /*
   * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: rcsmerge.c,v 1.17 2006/03/07 01:40:52 joris Exp $	*/
  /*
   * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
   * All rights reserved.
***************
*** 42,48 ****
  
  	baserev = rev2 = RCS_HEAD_REV;
  
! 	while ((ch = rcs_getopt(argc, argv, "AEek:p::q::r:TVx:")) != -1) {
  		switch (ch) {
  		case 'A': case 'E': case 'e':
  			break;
--- 42,48 ----
  
  	baserev = rev2 = RCS_HEAD_REV;
  
! 	while ((ch = rcs_getopt(argc, argv, "AEek:p::q::r:TVx:z:")) != -1) {
  		switch (ch) {
  		case 'A': case 'E': case 'e':
  			break;
***************
*** 81,86 ****
--- 81,89 ----
  			exit(0);
  		case 'x':
  			rcs_suffixes = rcs_optarg;
+ 			break;
+ 		case 'z':
+ 			timezone_flag = rcs_optarg;
  			break;
  		default:
  			break;