===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/cvs.h,v
retrieving revision 1.108
retrieving revision 1.109
diff -c -r1.108 -r1.109
*** src/usr.bin/cvs/cvs.h	2006/05/27 20:57:42	1.108
--- src/usr.bin/cvs/cvs.h	2006/05/28 01:24:28	1.109
***************
*** 1,4 ****
! /*	$OpenBSD: cvs.h,v 1.108 2006/05/27 20:57:42 joris Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: cvs.h,v 1.109 2006/05/28 01:24:28 joris Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
***************
*** 347,352 ****
  void	cvs_update_local(struct cvs_file *);
  void	cvs_update_enterdir(struct cvs_file *);
  void	cvs_update_leavedir(struct cvs_file *);
! int	cvs_checkout_file(struct cvs_file *, RCSNUM *, int);
  
  #endif
--- 347,355 ----
  void	cvs_update_local(struct cvs_file *);
  void	cvs_update_enterdir(struct cvs_file *);
  void	cvs_update_leavedir(struct cvs_file *);
! void	cvs_checkout_file(struct cvs_file *, RCSNUM *, BUF *, int);
! int	update_has_conflict_markers(struct cvs_file *);
! 
! #define CO_MERGE	0x01
  
  #endif