===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/commit.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -c -r1.71 -r1.72
*** src/usr.bin/cvs/commit.c	2006/06/07 07:01:12	1.71
--- src/usr.bin/cvs/commit.c	2006/06/13 06:51:32	1.72
***************
*** 1,4 ****
! /*	$OpenBSD: commit.c,v 1.71 2006/06/07 07:01:12 xsa Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   * Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: commit.c,v 1.72 2006/06/13 06:51:32 joris Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   * Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org>
***************
*** 86,92 ****
  	argv += optind;
  
  	if (logmsg == NULL)
! 		fatal("please use -m to specify a log message for now");
  
  	TAILQ_INIT(&files_affected);
  	conflicts_found = 0;
--- 86,92 ----
  	argv += optind;
  
  	if (logmsg == NULL)
! 		fatal("please use -m or -F to specify a log message for now");
  
  	TAILQ_INIT(&files_affected);
  	conflicts_found = 0;
***************
*** 143,149 ****
  	}
  
  	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++;
--- 143,150 ----
  	}
  
  	if (cf->file_status == FILE_MERGE ||
! 	    cf->file_status == FILE_PATCH ||
! 	    cf->file_status == FILE_CHECKOUT) {
  		cvs_log(LP_ERR, "conflict: %s is not up-to-date",
  		    cf->file_path);
  		conflicts_found++;