===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/diff3.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -c -r1.6 -r1.7
*** src/usr.bin/cvs/diff3.c	2005/11/08 16:06:03	1.6
--- src/usr.bin/cvs/diff3.c	2005/12/03 01:02:08	1.7
***************
*** 1,4 ****
! /*	$OpenBSD: diff3.c,v 1.6 2005/11/08 16:06:03 xsa Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
--- 1,4 ----
! /*	$OpenBSD: diff3.c,v 1.7 2005/12/03 01:02:08 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.6 2005/11/08 16:06:03 xsa Exp $";
  #endif /* not lint */
  
  #include <sys/queue.h>
--- 71,77 ----
  #endif /* not lint */
  
  #ifndef lint
! static const char rcsid[] = "$OpenBSD: diff3.c,v 1.7 2005/12/03 01:02:08 joris Exp $";
  #endif /* not lint */
  
  #include <sys/queue.h>
***************
*** 235,250 ****
  	argv[argc++] = path1;
  	argv[argc++] = path2;
  	argv[argc++] = path3;
! 	if ((diff3_conflicts = diff3_internal(argc, argv, workfile, r2)) < 0)
  		goto out;
  
  	if (cvs_buf_putc(diffb, '\0') < 0) {
  		cvs_buf_free(diffb);
  		goto out;
  	}
  
  	if (cvs_buf_putc(b1, '\0') < 0) {
  		cvs_buf_free(diffb);
  		goto out;
  	}
  
--- 235,257 ----
  	argv[argc++] = path1;
  	argv[argc++] = path2;
  	argv[argc++] = path3;
! 
! 	diff3_conflicts = diff3_internal(argc, argv, workfile, r2);
! 	if (diff3_conflicts < 0) {
! 		cvs_buf_free(diffb);
! 		diffb = NULL;
  		goto out;
+ 	}
  
  	if (cvs_buf_putc(diffb, '\0') < 0) {
  		cvs_buf_free(diffb);
+ 		diffb = NULL;
  		goto out;
  	}
  
  	if (cvs_buf_putc(b1, '\0') < 0) {
  		cvs_buf_free(diffb);
+ 		diffb = NULL;
  		goto out;
  	}
  
***************
*** 257,262 ****
--- 264,274 ----
  
  	if ((diffb = cvs_patchfile(data, patch, ed_patch_lines)) == NULL)
  		goto out;
+ 
+ 	if (diff3_conflicts != 0) {
+ 		cvs_printf("%d conflict%s found during merge, please correct.\n",
+ 		    diff3_conflicts, (diff3_conflicts > 1) ? "s" : "");
+ 	}
  
  	free(data);
  	free(patch);