===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/diff3.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -c -r1.17 -r1.18
*** src/usr.bin/cvs/diff3.c	2006/03/06 13:22:59	1.17
--- src/usr.bin/cvs/diff3.c	2006/03/14 15:59:06	1.18
***************
*** 1,4 ****
! /*	$OpenBSD: diff3.c,v 1.17 2006/03/06 13:22:59 xsa Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
--- 1,4 ----
! /*	$OpenBSD: diff3.c,v 1.18 2006/03/14 15:59:06 xsa Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
***************
*** 72,78 ****
  
  #ifndef lint
  static const char rcsid[] =
!     "$OpenBSD: diff3.c,v 1.17 2006/03/06 13:22:59 xsa Exp $";
  #endif /* not lint */
  
  #include "includes.h"
--- 72,78 ----
  
  #ifndef lint
  static const char rcsid[] =
!     "$OpenBSD: diff3.c,v 1.18 2006/03/14 15:59:06 xsa Exp $";
  #endif /* not lint */
  
  #include "includes.h"
***************
*** 155,161 ****
  int diff3_conflicts = 0;
  
  BUF *
! cvs_diff3(RCSFILE *rf, char *workfile, RCSNUM *rev1, RCSNUM *rev2)
  {
  	int ret, argc;
  	char *data, *patch;
--- 155,161 ----
  int diff3_conflicts = 0;
  
  BUF *
! cvs_diff3(RCSFILE *rf, char *workfile, RCSNUM *rev1, RCSNUM *rev2, int verbose)
  {
  	int ret, argc;
  	char *data, *patch;
***************
*** 173,183 ****
  	if ((b1 = cvs_buf_load(workfile, BUF_AUTOEXT)) == NULL)
  		goto out;
  
! 	cvs_printf("Retrieving revision %s\n", r1);
  	if ((b2 = rcs_getrev(rf, rev1)) == NULL)
  		goto out;
  
! 	cvs_printf("Retrieving revision %s\n", r2);
  	if ((b3 = rcs_getrev(rf, rev2)) == NULL)
  		goto out;
  
--- 173,185 ----
  	if ((b1 = cvs_buf_load(workfile, BUF_AUTOEXT)) == NULL)
  		goto out;
  
! 	if (verbose == 1)
! 		cvs_printf("Retrieving revision %s\n", r1);
  	if ((b2 = rcs_getrev(rf, rev1)) == NULL)
  		goto out;
  
! 	if (verbose == 1)
! 		cvs_printf("Retrieving revision %s\n", r2);
  	if ((b3 = rcs_getrev(rf, rev2)) == NULL)
  		goto out;
  
***************
*** 237,243 ****
  	if ((diffb = cvs_patchfile(data, patch, ed_patch_lines)) == NULL)
  		goto out;
  
! 	if (diff3_conflicts != 0) {
  		cvs_log(LP_WARN, "%d conflict%s found during merge, "
  		    "please correct.", diff3_conflicts,
  		    (diff3_conflicts > 1) ? "s" : "");
--- 239,245 ----
  	if ((diffb = cvs_patchfile(data, patch, ed_patch_lines)) == NULL)
  		goto out;
  
! 	if ((verbose ==1) && (diff3_conflicts != 0)) {
  		cvs_log(LP_WARN, "%d conflict%s found during merge, "
  		    "please correct.", diff3_conflicts,
  		    (diff3_conflicts > 1) ? "s" : "");