===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/rcsmerge.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -c -r1.2 -r1.3
*** src/usr.bin/rcs/rcsmerge.c	2005/10/23 04:07:06	1.2
--- src/usr.bin/rcs/rcsmerge.c	2005/10/23 04:25:34	1.3
***************
*** 1,4 ****
! /*	$OpenBSD: rcsmerge.c,v 1.2 2005/10/23 04:07:06 joris Exp $	*/
  /*
   * Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: rcsmerge.c,v 1.3 2005/10/23 04:25:34 joris Exp $	*/
  /*
   * Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org>
   * All rights reserved.
***************
*** 138,143 ****
--- 138,148 ----
  				cvs_log(LP_ERR, "failed to write new file");
  
  			cvs_buf_free(bp);
+ 		}
+ 
+ 		if (diff3_conflicts > 0) {
+ 			cvs_log(LP_WARN, "%d conflict%s found during merge",
+ 			    diff3_conflicts, (diff3_conflicts > 1) ? "s": "");
  		}
  
  		rcs_close(file);