===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/rcsmerge.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -c -r1.42 -r1.43
*** src/usr.bin/rcs/rcsmerge.c	2006/05/09 12:33:42	1.42
--- src/usr.bin/rcs/rcsmerge.c	2006/05/09 14:03:55	1.43
***************
*** 1,4 ****
! /*	$OpenBSD: rcsmerge.c,v 1.42 2006/05/09 12:33:42 ray Exp $	*/
  /*
   * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: rcsmerge.c,v 1.43 2006/05/09 14:03:55 jmc Exp $	*/
  /*
   * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
   * All rights reserved.
***************
*** 184,189 ****
  rcsmerge_usage(void)
  {
  	fprintf(stderr,
! 	    "usage: rcsmerge [-EeV] [-kmode] [-p[rev]] [-q[rev]]\n"
  	    "                [-xsuffixes] [-ztz] -rrev file ...\n");
  }
--- 184,189 ----
  rcsmerge_usage(void)
  {
  	fprintf(stderr,
! 	    "usage: rcsmerge [-EV] [-kmode] [-p[rev]] [-q[rev]]\n"
  	    "                [-xsuffixes] [-ztz] -rrev file ...\n");
  }