===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/file.c,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -r1.258 -r1.259
--- src/usr.bin/cvs/file.c	2009/03/28 16:47:33	1.258
+++ src/usr.bin/cvs/file.c	2010/07/13 20:47:19	1.259
@@ -1,4 +1,4 @@
-/*	$OpenBSD: file.c,v 1.258 2009/03/28 16:47:33 joris Exp $	*/
+/*	$OpenBSD: file.c,v 1.259 2010/07/13 20:47:19 nicm Exp $	*/
 /*
  * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
@@ -956,9 +956,6 @@
 						cf->file_status = FILE_MERGE;
 					else
 						cf->file_status = FILE_PATCH;
-				} else if (cf->file_ent->ce_conflict != NULL &&
-				    cf->file_status != FILE_MODIFIED) {
-					cf->file_status = FILE_CONFLICT;
 				}
 			}
 		}