===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/diff3.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -c -r1.15 -r1.16
*** src/usr.bin/cvs/diff3.c	2006/03/05 16:34:31	1.15
--- src/usr.bin/cvs/diff3.c	2006/03/06 08:46:55	1.16
***************
*** 1,4 ****
! /*	$OpenBSD: diff3.c,v 1.15 2006/03/05 16:34:31 niallo Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
--- 1,4 ----
! /*	$OpenBSD: diff3.c,v 1.16 2006/03/06 08:46:55 xsa Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
***************
*** 72,78 ****
  
  #ifndef lint
  static const char rcsid[] =
!     "$OpenBSD: diff3.c,v 1.15 2006/03/05 16:34:31 niallo Exp $";
  #endif /* not lint */
  
  #include "includes.h"
--- 72,78 ----
  
  #ifndef lint
  static const char rcsid[] =
!     "$OpenBSD: diff3.c,v 1.16 2006/03/06 08:46:55 xsa Exp $";
  #endif /* not lint */
  
  #include "includes.h"
***************
*** 241,248 ****
  		goto out;
  
  	if (diff3_conflicts != 0) {
! 		cvs_printf("%d conflict%s found during merge, "
! 		    "please correct.\n", diff3_conflicts,
  		    (diff3_conflicts > 1) ? "s" : "");
  	}
  
--- 241,248 ----
  		goto out;
  
  	if (diff3_conflicts != 0) {
! 		cvs_log(LP_WARN, "%d conflict%s found during merge, "
! 		    "please correct.", diff3_conflicts,
  		    (diff3_conflicts > 1) ? "s" : "");
  	}