===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/commit.c,v
retrieving revision 1.151
retrieving revision 1.152
diff -c -r1.151 -r1.152
*** src/usr.bin/cvs/commit.c	2011/04/20 18:41:40	1.151
--- src/usr.bin/cvs/commit.c	2011/12/27 13:59:01	1.152
***************
*** 1,4 ****
! /*	$OpenBSD: commit.c,v 1.151 2011/04/20 18:41:40 nicm Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   * Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: commit.c,v 1.152 2011/12/27 13:59:01 nicm Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   * Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org>
***************
*** 44,52 ****
  struct cvs_flisthead	files_removed;
  struct cvs_flisthead	files_modified;
  
- int	conflicts_found;
  char	*logmsg = NULL;
  char	*loginfo = NULL;
  
  struct cvs_cmd cvs_cmd_commit = {
  	CVS_OP_COMMIT, CVS_USE_WDIR | CVS_LOCK_REPO, "commit",
--- 44,53 ----
  struct cvs_flisthead	files_removed;
  struct cvs_flisthead	files_modified;
  
  char	*logmsg = NULL;
  char	*loginfo = NULL;
+ 
+ static int	conflicts_found;
  
  struct cvs_cmd cvs_cmd_commit = {
  	CVS_OP_COMMIT, CVS_USE_WDIR | CVS_LOCK_REPO, "commit",