===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/diff3.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -c -r1.26 -r1.27
*** src/usr.bin/rcs/diff3.c	2008/03/02 19:40:58	1.26
--- src/usr.bin/rcs/diff3.c	2009/02/25 23:16:20	1.27
***************
*** 1,4 ****
! /*	$OpenBSD: diff3.c,v 1.26 2008/03/02 19:40:58 tobias Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
--- 1,4 ----
! /*	$OpenBSD: diff3.c,v 1.27 2009/02/25 23:16:20 ray Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
***************
*** 72,78 ****
  
  #ifndef lint
  static const char rcsid[] =
!     "$OpenBSD: diff3.c,v 1.26 2008/03/02 19:40:58 tobias Exp $";
  #endif /* not lint */
  
  #include <ctype.h>
--- 72,78 ----
  
  #ifndef lint
  static const char rcsid[] =
!     "$OpenBSD: diff3.c,v 1.27 2009/02/25 23:16:20 ray Exp $";
  #endif /* not lint */
  
  #include <ctype.h>
***************
*** 199,206 ****
  	rcs_buf_free(b2);
  	b2 = NULL;
  
! 	if ((diffreg(path1, path3, d1, 0) == D_ERROR) ||
! 	    (diffreg(path2, path3, d2, 0) == D_ERROR)) {
  		rcs_buf_free(diffb);
  		diffb = NULL;
  		goto out;
--- 199,206 ----
  	rcs_buf_free(b2);
  	b2 = NULL;
  
! 	if ((diffreg(path1, path3, d1, D_FORCEASCII) == D_ERROR) ||
! 	    (diffreg(path2, path3, d2, D_FORCEASCII) == D_ERROR)) {
  		rcs_buf_free(diffb);
  		diffb = NULL;
  		goto out;
***************
*** 326,333 ****
  	rcs_buf_free(b2);
  	b2 = NULL;
  
! 	if ((diffreg(path1, path3, d1, 0) == D_ERROR) ||
! 	    (diffreg(path2, path3, d2, 0) == D_ERROR)) {
  		rcs_buf_free(diffb);
  		diffb = NULL;
  		goto out;
--- 326,333 ----
  	rcs_buf_free(b2);
  	b2 = NULL;
  
! 	if ((diffreg(path1, path3, d1, D_FORCEASCII) == D_ERROR) ||
! 	    (diffreg(path2, path3, d2, D_FORCEASCII) == D_ERROR)) {
  		rcs_buf_free(diffb);
  		diffb = NULL;
  		goto out;