===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/commit.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -c -r1.56 -r1.57
*** src/usr.bin/cvs/commit.c	2006/05/27 06:16:14	1.56
--- src/usr.bin/cvs/commit.c	2006/05/27 14:05:53	1.57
***************
*** 1,4 ****
! /*	$OpenBSD: commit.c,v 1.56 2006/05/27 06:16:14 joris Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   *
--- 1,4 ----
! /*	$OpenBSD: commit.c,v 1.57 2006/05/27 14:05:53 joris Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   *
***************
*** 114,119 ****
--- 114,126 ----
  	    cf->file_status == FILE_LOST ||
  	    cf->file_status == FILE_UNLINK)
  		conflicts_found++;
+ 
+ 	if (cf->file_status == FILE_MERGE ||
+ 	    cf->file_status == FILE_PATCH) {
+ 		cvs_log(LP_ERR, "conflict: %s is not up-to-date",
+ 		    cf->file_path);
+ 		conflicts_found++;
+ 	}
  
  	if (cf->file_status == FILE_ADDED ||
  	    cf->file_status == FILE_REMOVED ||