===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/diff3.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -c -r1.30 -r1.31
*** src/usr.bin/cvs/diff3.c	2007/01/11 17:44:18	1.30
--- src/usr.bin/cvs/diff3.c	2007/01/12 17:25:33	1.31
***************
*** 1,4 ****
! /*	$OpenBSD: diff3.c,v 1.30 2007/01/11 17:44:18 niallo Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
--- 1,4 ----
! /*	$OpenBSD: diff3.c,v 1.31 2007/01/12 17:25:33 joris Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
***************
*** 72,78 ****
  
  #ifndef lint
  static const char rcsid[] =
!     "$OpenBSD: diff3.c,v 1.30 2007/01/11 17:44:18 niallo Exp $";
  #endif /* not lint */
  
  #include "includes.h"
--- 72,78 ----
  
  #ifndef lint
  static const char rcsid[] =
!     "$OpenBSD: diff3.c,v 1.31 2007/01/12 17:25:33 joris Exp $";
  #endif /* not lint */
  
  #include "includes.h"
***************
*** 227,235 ****
  		diffb = NULL;
  		goto out;
  	}
- 
- 	cvs_buf_putc(diffb, '\0');
- 	cvs_buf_putc(b1, '\0');
  
  	plen = cvs_buf_len(diffb);
  	patch = cvs_buf_release(diffb);
--- 227,232 ----