===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/diff3.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -c -r1.47 -r1.48
*** src/usr.bin/cvs/diff3.c	2008/03/08 20:26:34	1.47
--- src/usr.bin/cvs/diff3.c	2008/03/09 01:52:55	1.48
***************
*** 1,4 ****
! /*	$OpenBSD: diff3.c,v 1.47 2008/03/08 20:26:34 joris Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
--- 1,4 ----
! /*	$OpenBSD: diff3.c,v 1.48 2008/03/09 01:52:55 joris Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
***************
*** 72,78 ****
  
  #ifndef lint
  static const char rcsid[] =
!     "$OpenBSD: diff3.c,v 1.47 2008/03/08 20:26:34 joris Exp $";
  #endif /* not lint */
  
  #include <ctype.h>
--- 72,78 ----
  
  #ifndef lint
  static const char rcsid[] =
!     "$OpenBSD: diff3.c,v 1.48 2008/03/09 01:52:55 joris Exp $";
  #endif /* not lint */
  
  #include <ctype.h>
***************
*** 333,339 ****
  int
  ed_patch_lines(struct cvs_lines *dlines, struct cvs_lines *plines)
  {
! 	char op, *ep, *p;
  	struct cvs_line *sort, *lp, *dlp, *ndlp, *insert_after;
  	int start, end, i, lineno;
  	u_char tmp;
--- 333,339 ----
  int
  ed_patch_lines(struct cvs_lines *dlines, struct cvs_lines *plines)
  {
! 	char op, *ep;
  	struct cvs_line *sort, *lp, *dlp, *ndlp, *insert_after;
  	int start, end, i, lineno;
  	u_char tmp;