===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/diff3.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -c -r1.40 -r1.41
*** src/usr.bin/cvs/diff3.c	2008/02/11 20:33:11	1.40
--- src/usr.bin/cvs/diff3.c	2008/02/23 23:42:23	1.41
***************
*** 1,4 ****
! /*	$OpenBSD: diff3.c,v 1.40 2008/02/11 20:33:11 tobias Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
--- 1,4 ----
! /*	$OpenBSD: diff3.c,v 1.41 2008/02/23 23:42:23 joris Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
***************
*** 72,78 ****
  
  #ifndef lint
  static const char rcsid[] =
!     "$OpenBSD: diff3.c,v 1.40 2008/02/11 20:33:11 tobias Exp $";
  #endif /* not lint */
  
  #include <ctype.h>
--- 72,78 ----
  
  #ifndef lint
  static const char rcsid[] =
!     "$OpenBSD: diff3.c,v 1.41 2008/02/23 23:42:23 joris Exp $";
  #endif /* not lint */
  
  #include <ctype.h>
***************
*** 172,177 ****
--- 172,178 ----
  	struct cvs_line *lp;
  	struct cvs_lines *dlines, *plines;
  
+ 	overlapcnt = 0;
  	b1 = b2 = b3 = d1 = d2 = diffb = NULL;
  	rcsnum_tostr(cf->file_ent->ce_rev, r1, sizeof(r1));
  	rcsnum_tostr(cf->file_rcsrev, r2, sizeof(r2));