===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/rcsmerge.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -c -r1.18 -r1.19
*** src/usr.bin/rcs/rcsmerge.c	2006/03/08 08:44:29	1.18
--- src/usr.bin/rcs/rcsmerge.c	2006/03/08 12:34:53	1.19
***************
*** 1,4 ****
! /*	$OpenBSD: rcsmerge.c,v 1.18 2006/03/08 08:44:29 xsa Exp $	*/
  /*
   * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: rcsmerge.c,v 1.19 2006/03/08 12:34:53 xsa Exp $	*/
  /*
   * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
   * All rights reserved.
***************
*** 165,170 ****
  rcsmerge_usage(void)
  {
  	fprintf(stderr,
! 	    "usage: rcsmerge [-AEeV] [-kmode] [-p[rev]] [-q[rev]] "
! 	    "[-rrev] [-xsuffixes] [-ztz] file ...\n");
  }
--- 165,170 ----
  rcsmerge_usage(void)
  {
  	fprintf(stderr,
! 	    "usage: rcsmerge [-AEeV] [-kmode] [-p[rev]] [-q[rev]]\n"
! 	    "                [-rrev] [-xsuffixes] [-ztz] file ...\n");
  }