===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/rcsprog.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -c -r1.14 -r1.15
*** src/usr.bin/rcs/rcsprog.h	2005/10/18 01:22:14	1.14
--- src/usr.bin/rcs/rcsprog.h	2005/10/18 16:20:31	1.15
***************
*** 1,4 ****
! /*	$OpenBSD: rcsprog.h,v 1.14 2005/10/18 01:22:14 joris Exp $	*/
  /*
   * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: rcsprog.h,v 1.15 2005/10/18 16:20:31 xsa Exp $	*/
  /*
   * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
   * All rights reserved.
***************
*** 42,47 ****
--- 42,48 ----
  void	checkin_usage(void);
  void	rcsdiff_usage(void);
  void	rcsclean_usage(void);
+ void	rcsmerge_usage(void);
  void	rlog_usage(void);
  void	ident_usage(void);
  void	(*usage)(void);
***************
*** 56,61 ****
--- 57,63 ----
  int	rcs_main(int, char **);
  int	rcsdiff_main(int, char **);
  int	rcsclean_main(int, char **);
+ int	rcsmerge_main(int, char **);
  int	rlog_main(int, char **);
  int	ident_main(int, char **);