===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/diff3.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -c -r1.2 -r1.3
*** src/usr.bin/cvs/diff3.c	2005/10/23 03:47:12	1.2
--- src/usr.bin/cvs/diff3.c	2005/10/23 04:03:58	1.3
***************
*** 1,4 ****
! /*	$OpenBSD: diff3.c,v 1.2 2005/10/23 03:47:12 joris Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
--- 1,4 ----
! /*	$OpenBSD: diff3.c,v 1.3 2005/10/23 04:03:58 joris Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
***************
*** 71,77 ****
  #endif /* not lint */
  
  #ifndef lint
! static const char rcsid[] = "$OpenBSD: diff3.c,v 1.2 2005/10/23 03:47:12 joris Exp $";
  #endif /* not lint */
  
  #include <sys/queue.h>
--- 71,77 ----
  #endif /* not lint */
  
  #ifndef lint
! static const char rcsid[] = "$OpenBSD: diff3.c,v 1.3 2005/10/23 04:03:58 joris Exp $";
  #endif /* not lint */
  
  #include <sys/queue.h>
***************
*** 317,323 ****
  	dlp = TAILQ_FIRST(&(dlines->l_lines));
  	lp = TAILQ_FIRST(&(plines->l_lines));
  
! 	busy = 0;
  	for (lp = TAILQ_NEXT(lp, l_list); lp != NULL;
  	    lp = TAILQ_NEXT(lp, l_list)) {
  		op = lp->l_line[strlen(lp->l_line) - 1];
--- 317,323 ----
  	dlp = TAILQ_FIRST(&(dlines->l_lines));
  	lp = TAILQ_FIRST(&(plines->l_lines));
  
! 	busy = end = 0;
  	for (lp = TAILQ_NEXT(lp, l_list); lp != NULL;
  	    lp = TAILQ_NEXT(lp, l_list)) {
  		op = lp->l_line[strlen(lp->l_line) - 1];