===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/diff3.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -c -r1.24 -r1.25
*** src/usr.bin/rcs/diff3.c	2007/09/10 14:29:53	1.24
--- src/usr.bin/rcs/diff3.c	2007/12/23 01:15:12	1.25
***************
*** 1,4 ****
! /*	$OpenBSD: diff3.c,v 1.24 2007/09/10 14:29:53 tobias Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
--- 1,4 ----
! /*	$OpenBSD: diff3.c,v 1.25 2007/12/23 01:15:12 tedu Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
***************
*** 72,78 ****
  
  #ifndef lint
  static const char rcsid[] =
!     "$OpenBSD: diff3.c,v 1.24 2007/09/10 14:29:53 tobias Exp $";
  #endif /* not lint */
  
  #include <ctype.h>
--- 72,78 ----
  
  #ifndef lint
  static const char rcsid[] =
!     "$OpenBSD: diff3.c,v 1.25 2007/12/23 01:15:12 tedu Exp $";
  #endif /* not lint */
  
  #include <ctype.h>
***************
*** 137,143 ****
  static int eflag = 3;	/* default -E for compatibility with former RCS */
  static int oflag = 1;	/* default -E for compatibility with former RCS */
  static int debug  = 0;
! static char f1mark[40], f3mark[40];	/* markers for -E and -X */
  
  static int duplicate(struct range *, struct range *);
  static int edit(struct diff *, int, int);
--- 137,143 ----
  static int eflag = 3;	/* default -E for compatibility with former RCS */
  static int oflag = 1;	/* default -E for compatibility with former RCS */
  static int debug  = 0;
! static char f1mark[256], f3mark[256];	/* markers for -E and -X */
  
  static int duplicate(struct range *, struct range *);
  static int edit(struct diff *, int, int);